am df3633b3: Merge "Make it harder for apps to mess up ViewGroup\'s internal...
am df3633b3: Merge "Make it harder for apps to mess up ViewGroup\'s internal state Bug #6421288" into jb-dev
* commit 'df3633b3':
Make it harder for apps to mess up ViewGroup's internal state Bug #6421288