summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/AndroidKeyStore.java
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-04-16 17:07:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-16 17:07:47 +0000
commit22b5d9b969176a196b0b29ce9441ac3d1d35d208 (patch)
treef4ffa1a488b9132ccbbae0d42f08c73c53a0875a /keystore/java/android/security/AndroidKeyStore.java
parent133911095ce0d9ef01766aa7b67a0a31b852e242 (diff)
parent28a9089f5b79e20ca5b023830255cf438a9cded7 (diff)
am 28a9089f: am 216d18b9: Merge "Remove IV auto-generation workaround."
* commit '28a9089f5b79e20ca5b023830255cf438a9cded7': Remove IV auto-generation workaround.
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions