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

..

assets

…

res

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

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

Android.mk

…

AndroidManifest.xml

am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev

2014-04-11 19:34:51 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…