OSDN Git Service

Merge ""Unlocked device required" javadoc clarification" into pi-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 2 Apr 2018 21:40:34 +0000 (21:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 2 Apr 2018 21:40:34 +0000 (21:40 +0000)
commit084f9aee9a54a86680feed7cafd56a06ba6f24f8
tree9f094fc4b33c4e2132786a15025725915ab45ce0
parent6d24a1c8bef4c70ac1e646ffb21299ad7fe4a22b
parent6f8fa9ac83e8690728400ca78e7b969d01fceb62
Merge ""Unlocked device required" javadoc clarification" into pi-dev
keystore/java/android/security/keystore/KeyGenParameterSpec.java
keystore/java/android/security/keystore/KeyProtection.java