Justin Koh fd04632ab5 am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev ...

* commit '3caf92582498bad8fe79f6e3235be218e82b7f68':
  Hide getDeviceGlobalActionKeyTimeout

2014-05-05 22:38:13 +00:00

..

java

am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev

2014-05-05 22:38:13 +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