Deepanshu Gupta 35d46778f4 resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp ...

Change-Id: I2fec735ba65f56da7d17022074f8924a259b4bbf

2014-04-16 12:14:34 -07:00

..

java

resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp

2014-04-16 12:14:34 -07:00

jni

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

res

Merge "Import translations. DO NOT MERGE" into klp-modular-dev

2014-04-16 15:28:29 +00:00

tests

am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev

2014-03-18 22:34:17 +00:00