Adrian Roos c344cdc1bb am ccb7a9af: Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev ...

* commit 'ccb7a9af271836fde98636d9ce6ebbda09eb0158':
  Prevent ChooserActivity from taking over the system bars

2014-10-16 14:56:40 +00:00

..

java

Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev

2014-10-16 14:54:19 +00:00

jni

Merge "Enable fast jni for simple RenderNode/Matrix/Paint operations" into lmp-mr1-dev

2014-10-08 19:58:13 +00:00

res

Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

2014-10-15 22:38:39 +00:00

tests

Add CHANGE_NETWORK_STATE permission to bt tests

2014-10-15 14:06:30 -07:00