Zhentao Sun e0dda90bde am aa64548d: Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev ...

* commit 'aa64548d9f7ee0d3378bc62657e0b86d486038d6':
  Fixed unreleased wake lock isues and NPE.

2013-05-07 11:44:46 -07:00

..

java

am aa64548d: Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev

2013-05-07 11:44:46 -07:00

jni

Register EGLExt JNI methods

2013-05-06 11:36:59 -07:00

res

Import translations. DO NOT MERGE

2013-05-06 09:35:57 -07:00

tests

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

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