diff options
| author | 2022-09-15 19:02:55 +0000 | |
|---|---|---|
| committer | 2022-09-15 19:02:55 +0000 | |
| commit | 158a067a2cdecec4ff1eb8fdd57140068db392d5 (patch) | |
| tree | aaad0f522949f03b857632c12b865488216c9b0b /libs/androidfw/ResourceTimer.cpp | |
| parent | fdd57fcb4c157c8a6547037617c501b7ccb04f8e (diff) | |
| parent | aff81a5527cfc53ad97ee65f1068d29df67cb730 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101
Change-Id: I3295544c30898686d73629eb3cb163b2cfad48f7
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