summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyChain.java
diff options
context:
space:
mode:
authorDiego Vela <diegovela@google.com>2020-12-14 22:56:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-14 22:56:15 +0000
commitbadc7a9249aaa932bffd0a3fe8c95813606fe25c (patch)
treeeb9bd7411ea300f4e5c9e5d439c5cfea7a5ab8d3 /keystore/java/android/security/KeyChain.java
parentaf9f1737b0c823557a21317f6758794e089f00de (diff)
parent1e02d710bc6aa09c4c2d2d1e347ad5950f904534 (diff)
Merge "Revert^2 "Add <uses-library> information."" am: 6e35bf94ec am: 1f9067267a am: 1e02d710bc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526686 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibdd9fef3e5b32ec70d542a0e3e8533d328d4641f
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions