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

* commit '09f3cc2bcca62fea30dc0f22cc120088e9f54728':
  Fix GLES30 JNI registration

2013-04-30 19:36:03 -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

Fix GLES30 JNI registration

2013-04-29 16:02:16 -07:00

res

Import translations. DO NOT MERGE

2013-04-29 22:25:03 -07:00

tests

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

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