Commits
Craig Mautner authored and Android Git Automerger committed ae2a3c776beM
am ce1696c2: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev * commit 'ce1696c22a2fab8c3df63fd504a844f3fccd6cfc':
Showing diff to50920f5f586