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

* commit '7f2c9e9420252a493b7399639f794c8a963444e5':
  Add a config override for ViewConfiguration#hasPermanentMenuKey

2014-03-11 23:26:38 +00:00

..

java

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

2014-03-11 23:26: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 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev

2014-03-11 23:26:38 +00:00

tests

Fix BandwidthTest to report correct stats.

2013-11-06 12:11:07 -08:00