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

* commit 'df3633b38969e134c5370449b8247827c705ac1e':
  Make it harder for apps to mess up ViewGroup's internal state Bug #6421288

2012-05-23 16:05:15 -07:00

..

java

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

2012-05-23 16:05:15 -07:00

jni

Merge "drop frame in case of error in updateTexImage" into jb-dev

2012-05-18 17:09:10 -07:00

res

am b72ac9dd: Merge "BigPicture notifications for screenshots." into jb-dev

2012-05-23 13:35:56 -07:00

tests

…