diff options
| author | Miranda Kephart <mkephart@google.com> | 2021-03-10 20:33:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-10 20:33:51 +0000 |
| commit | c202b0836a36653af44cff5d0fee0222a34fd763 (patch) | |
| tree | e0826a5593afc2a571c903288c10c656bf7b4c25 /keystore/java/android/security/AndroidKeyStoreMaintenance.java | |
| parent | 55255a5a1d7ed50cada4569b48136f2784d16add (diff) | |
| parent | 91175a30c6163c3137398cc0c282fb6f780a6969 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into oc-mr1-dev am: 84fcb616be -s ours am: 663162c3b0 -s ours am: 250d08c924 am: 91175a30c6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420818
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie819e8cfd7d5101c7e86f0e9c871c71bae453856
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStoreMaintenance.java')
0 files changed, 0 insertions, 0 deletions