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

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

2013-09-18 17:02:48 -07:00

..

java

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

2013-09-18 17:02:48 -07:00

jni

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

2013-09-18 10:55:43 -07:00

res

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

2013-09-18 13:16:48 -07:00

tests

Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev

2013-09-16 21:11:31 +00:00