OSDN Git Service

Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev
authorKenny Root <kroot@google.com>
Mon, 20 Aug 2012 21:20:31 +0000 (14:20 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 20 Aug 2012 21:20:32 +0000 (14:20 -0700)
commit672cfdc5b6194a416eae93f5ebe82cb624e2add6
tree062eb7dc3f56b646d404fc7aa1dc5dee65fc8180
parent9af67e8f6c7dd98baa6232ff2cda97510b827637
parente29df16cb57b69995df597e8a6d95d986c1c43fc
Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev
core/java/android/app/ActivityThread.java