Jesse Hall fcafc3259e am 0b30ad53: am 09f3cc2b: Merge "Fix GLES30 JNI registration" into jb-mr2-dev ...

* commit '0b30ad53423a9bfab53b1632a33159be3d82e3df':
  Fix GLES30 JNI registration

2013-04-30 19:38:14 -07:00

..

java

am b107b7e9: Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436" into jb-mr2-dev

2013-04-30 18:16:11 -07:00

jni

am 0b30ad53: am 09f3cc2b: Merge "Fix GLES30 JNI registration" into jb-mr2-dev

2013-04-30 19:38:14 -07:00

res

Import translations. DO NOT MERGE

2013-04-29 22:34:34 -07:00

tests

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-29 23:09:03 -07:00