diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-02 15:45:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-02 15:45:31 +0000 |
| commit | e3762e416f8adac2b34abef8768ab2ef07315d80 (patch) | |
| tree | ce6487d3ccc2e696406c266a401f9b3ad4254f85 /keystore/java/android/security/KeyStore.java | |
| parent | 5ed4e2a767cc3f7953f34cf09e7856294645d34a (diff) | |
| parent | e6f781e9e4f7fdade713ad7ceed1c56f84d04373 (diff) | |
[automerger skipped] Merge "Gate exemptFromEentitlementCheck by Network_STACK permission" into rvc-dev am: 195d9712d6 am: 722888c60f am: e6f781e9e4 -s ours
am skip reason: Change-Id I6ddfda23d36ea9981e3e1eb5a87767f452a65852 with SHA-1 7e9b5c0875 is in history
Original change: undetermined
Change-Id: I3eec785ea60e6afeb0938e91a811644cc233628b
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
0 files changed, 0 insertions, 0 deletions