Dirk Dougherty 95cf532fe3 am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs ...

* commit '26de0b7118e188bac5a30d9562418fa09be3826a':
  Update permission description string.

2014-03-03 22:18:04 +00:00

..

java

am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev

2014-03-03 22:02:14 +00:00

jni

Merge "mNativeCanvas is long, not int."

2014-01-29 15:02:05 +00:00

res

am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs

2014-03-03 22:18:04 +00:00

tests

XmlUtils#readThisMapXml should handle null keys.

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