summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyChain.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-07-25 15:46:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-25 15:46:56 +0000
commit30588da701a6aa8023f9b929709e31d36797d8b0 (patch)
tree067a0c1043e329a0faefd447dafe29d456fe7b87 /keystore/java/android/security/KeyChain.java
parentaa57295104bd81e742dda6c21abcdefad8b3af58 (diff)
parent616ba9d22bbf0038f572e51cf8743942eafe1a34 (diff)
Merge "Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a" into nyc-dev
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions