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