Eric Rowe de96b966fb am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev ...

* commit '1b4a728ac689fc63b5b5153e95b8b634f701fcfb':
  Add CHANGE_NETWORK_STATE permission to bt tests

2014-10-15 23:40:40 +00:00

..

java

am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev

2014-10-15 18:26:59 +00:00

jni

Fix incorrect JNI_ABORT

2014-10-06 12:44:09 -07: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