OSDN Git Service

Merge "Prefer GCM to CBC or CTR in documentation." into mnc-dev
authorAlex Klyubin <klyubin@google.com>
Wed, 17 Jun 2015 18:32:22 +0000 (18:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 17 Jun 2015 18:32:24 +0000 (18:32 +0000)
commit97f4d3b40754e4496caeb29ee54c330d8bc9f2d7
treee57ba64cd76b99bf2ae3bf9f835a209a17a49f5d
parentb7bbd629eb0370f36ce27cbc9ecfc7e5c9d8953f
parenta5e21f0ee2fbf3a6f03e31fca8da459e1fe9e213
Merge "Prefer GCM to CBC or CTR in documentation." into mnc-dev
keystore/java/android/security/keystore/KeyGenParameterSpec.java
keystore/java/android/security/keystore/KeyInfo.java
keystore/java/android/security/keystore/KeyProtection.java