summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyChain.java
diff options
context:
space:
mode:
authorBenedict Wong <benedictwong@google.com>2021-04-03 01:15:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-03 01:15:50 +0000
commit233c7f5840ce63f1e33dad225539111a6b102c6d (patch)
tree9940f4f76f3221d646d0b80959ba87293298f07a /keystore/java/android/security/KeyChain.java
parentd6727c254d783a524b714262dc5489499a53defa (diff)
parent385ce8ed8a23299614730226866fb4a5f752ff66 (diff)
Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi" am: c7c4b1323b am: 385ce8ed8a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652974 Change-Id: Ib714d9a03e5b5152a576330711a8894178db4a95
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions