OSDN Git Service

am 1a3ab87e: am 614b39f3: Merge "Refactor Android Keystore CipherSpi base class....
authorAlex Klyubin <klyubin@google.com>
Mon, 1 Jun 2015 15:26:52 +0000 (15:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:26:52 +0000 (15:26 +0000)
* commit '1a3ab87e93d26e659067298e250fe5e8cfc2e1b8':
  Refactor Android Keystore CipherSpi base class.


Trivial merge