Adam Powell b61d39957b am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev ...

* commit '898d6d964cb3b650b5c9bed2276310547e5455e0':
  Add a config override for ViewConfiguration#hasPermanentMenuKey

2014-03-14 00:40:11 +00:00

..

java

am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev

2014-03-14 00:40:11 +00:00

jni

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

2014-03-13 01:55:28 +00:00

res

am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev

2014-03-14 00:40:11 +00:00

tests

Move Json{Reader,Writer} test to cts.

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