diff options
| author | 2022-09-19 21:08:43 +0000 | |
|---|---|---|
| committer | 2022-09-19 21:08:43 +0000 | |
| commit | aebe4548c2a14ba744abf13b2f5f9d652f682e16 (patch) | |
| tree | 8b2b068b7dbf7161255ce9abf1161e605e33f7f0 /libs/androidfw/ResourceTimer.cpp | |
| parent | 3d89cc5df6729cab8d98c967d73e03e23048d52b (diff) | |
| parent | 7c4da0ebf121b0534bb777a53552015ddf884e02 (diff) | |
[automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212
Change-Id: I74a450cd414480e91bd960065f4059690c61d335
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