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

* commit '6015844578dc4d725c7ab3d3004d18ffea446087':
  Make global action key timeout configurable.

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

..

java

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

2014-05-02 17:28:53 +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 c6ebc0d1: Merge "make success explicit in BT instrumentation util" into klp-modular-dev

2014-04-29 23:09:12 +00:00