Amith Yamasani f5a553a427 am 55a08c5a: Merge "Allow requiredForAllUsers to work on updates to system apps" into jb-mr2-dev ...

* commit '55a08c5ab91014eb42ecdc9e7039c7bae1f00058':
  Allow requiredForAllUsers to work on updates to system apps

2013-05-01 21:27:14 -07:00

..

java

am 55a08c5a: Merge "Allow requiredForAllUsers to work on updates to system apps" into jb-mr2-dev

2013-05-01 21:27:14 -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