Adam Powell 41685ce983 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-13 23:53:38 +00:00

..

java

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

2014-03-13 23:53:38 +00:00

jni

Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev

2014-03-07 18:13:29 +00:00

res

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

2014-03-13 23:53:38 +00:00

tests

XmlUtils#readThisMapXml should handle null keys.

2014-01-06 11:18:21 +00:00