diff options
| author | 2022-09-15 19:53:05 +0000 | |
|---|---|---|
| committer | 2022-09-15 19:53:05 +0000 | |
| commit | 796ed1f91bb861727e4d77e371becb6dcaaa8d17 (patch) | |
| tree | b2f700a4a55b9b7fb722d2fa15e43b2bf9e4ce38 /libs/androidfw/ResourceTimer.cpp | |
| parent | cc560594e5a9b1d026f9efa27158139523e81018 (diff) | |
| parent | 1b1dc203ba38f5e2a616fcb39ed31720786e87a6 (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: 1b1dc203ba -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101
Change-Id: I295bfd9bad2f022bdd0973949e81f5561b009f5f
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