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

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

2012-05-23 16:08:53 -07:00

..

java

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

2012-05-23 16:08:53 -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 7ecc8974: am b72ac9dd: Merge "BigPicture notifications for screenshots." into jb-dev

2012-05-23 13:39:36 -07:00

tests

am 0ddb5d3b: am 9cb376e7: Merge "Change NPN to forbid empty lists of protocols." into jb-dev

2012-05-21 12:40:41 -07:00