Justin Koh 8e4cbcce66 am f8a10d77: Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev ...

* commit 'f8a10d775efcc1c7255c1e504bf59f7cd38967ef':
  Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE

2014-05-05 22:42:19 +00:00

..

java

am f8a10d77: Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev

2014-05-05 22:42:19 +00:00

jni

am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."

2014-05-01 10:22:56 +00:00

res

am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev

2014-05-02 17:28:53 +00:00

tests

am 1edfd835: Merge "add getAddress function to return BT mac" into klp-modular-dev

2014-05-03 00:35:26 +00:00