Jeff Brown ec463b96e1 resolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aosp ...

Change-Id: I0fa4486ed300a35de3af8748e01300b01f03ec01

2014-03-11 21:01:49 -07:00

..

java

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

2014-03-11 21:01:49 -07:00

jni

am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."

2014-03-11 15:17:45 +00:00

res

am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev

2014-03-07 23:39:12 +00:00

tests

Move Json{Reader,Writer} test to cts.

2014-02-17 17:51:43 +00:00