Narayan Kamath 3a951e52d9 resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp ...

Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a

2014-05-01 15:32:20 +01:00

..

java

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

2014-05-01 15:32:20 +01:00

jni

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

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

res

am 11b715da: Merge "Make touch slop region smaller for watch" into klp-modular-dev

2014-04-30 19:46:07 +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