diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2021-02-07 19:52:03 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-07 19:52:03 +0000 |
commit | 9a95eef41dd1ff7650fbc37b804a4ead80577ef9 (patch) | |
tree | cbe5e7bd6eee6b234981065f1a8fe33ba98745be /keystore/java/android/security/KeyStoreSecurityLevel.java | |
parent | 0ddbb9c04ddedc2a440772a76f93cab7a1176b8f (diff) | |
parent | 580ed937dd5d668db600138bdfaf988d2912eab0 (diff) |
Merge "More cleanly separate requests and listens." am: 7a4c248582 am: 80fbe908e8 am: 580ed937dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565202
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I859c265fb73352cc8e0c2db5cdd119644c230dd3
Diffstat (limited to 'keystore/java/android/security/KeyStoreSecurityLevel.java')
0 files changed, 0 insertions, 0 deletions