Jim Miller 8b7ea57f8e am cd87d0ab: am f4292478: Merge "Fix keyguard/Keystore storage issue" into klp-dev ...

* commit 'cd87d0ab9623d5028d767e8167923c57aa2bac0d':
  Fix keyguard/Keystore storage issue

2013-09-18 17:06:21 -07:00

..

java

am cd87d0ab: am f4292478: Merge "Fix keyguard/Keystore storage issue" into klp-dev

2013-09-18 17:06:21 -07:00

jni

am 2e4e9889: am 3490228e: Merge "Use a native buffer for decoding images." into klp-dev

2013-09-18 10:58:27 -07:00

res

am faebc647: am bd49a1da: Merge "Change case of "keyset" to "keySet" for manifests" into klp-dev

2013-09-18 13:18:33 -07:00

tests

am bac2fcac: am 326f4505: Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev

2013-09-16 14:19:18 -07:00