Alan Viverette 839321a362 am c25dbb50: am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev ...

* commit 'c25dbb50c30816c97227b9a26cc46afec4e5318e':
  DO NOT MERGE Check item type before re-binding transient state views

2014-03-13 18:02:14 +00:00

..

java

am c25dbb50: am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev

2014-03-13 18:02:14 +00: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