summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyChain.java
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2016-11-07 23:54:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-07 23:54:45 +0000
commit9d710882602a8a0ad661cf10ce2cb421f3255ee2 (patch)
tree9dd396bd084eacc6e200d7d0a7da7a4a64afadcc /keystore/java/android/security/KeyChain.java
parent65de2219962a246fad1f5fecdfc1d636e122ec46 (diff)
parent2a9cc83dee6801d37b05632c98276a53317a227f (diff)
Merge "[AWARE] Fix visibility of Aware Characteristics API" am: 13c76b77dc am: 60e6734100 am: 5f9b3d834b
am: 2a9cc83dee Change-Id: I2df8122823b811c2418f8d5e583933632fa7b818
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions