diff options
| author | 2022-09-15 20:19:10 +0000 | |
|---|---|---|
| committer | 2022-09-15 20:19:10 +0000 | |
| commit | 4386420afb7b233e7414833ccf87ec9ffe14b973 (patch) | |
| tree | 5b1603b16370031a803ed42c282d38908c135182 /libs/androidfw/ResourceTimer.cpp | |
| parent | e07901de9bba279b4f4481daaaad376318965eee (diff) | |
| parent | 21bf4b1213887ddbebf19852c4f004f89c40b54a (diff) | |
[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f113 am: 1bc514701a -s ours am: c64e0d7063 -s ours am: aff81a5527 -s ours am: 158a067a2c -s ours am: 21bf4b1213 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101
Change-Id: Ie12d9646f9e672b1adb3cf5395f19cd2e03a34d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions