OSDN Git Service

am 87cca291: Merge "New AndroidKeyStore API in android.security.keystore." into mnc-dev
authorAlex Klyubin <klyubin@google.com>
Wed, 13 May 2015 21:44:55 +0000 (21:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 May 2015 21:44:55 +0000 (21:44 +0000)
* commit '87cca291bd70100522b62a28e7e6e433fcd49cc2':
  New AndroidKeyStore API in android.security.keystore.


Trivial merge