am 310ba5dd: am b260f353: Merge "Catch padding changes in ViewGroup to...
am 310ba5dd: am b260f353: Merge "Catch padding changes in ViewGroup to properly clip children Bug #6886339" into jb-mr1-dev
* commit '310ba5dd':
Catch padding changes in ViewGroup to properly clip children Bug #6886339