diff options
| author | 2022-09-19 21:38:51 +0000 | |
|---|---|---|
| committer | 2022-09-19 21:38:51 +0000 | |
| commit | cf19e19498a110654dd495727e8ecb1690b02f33 (patch) | |
| tree | 23f7d79a832f149ee298aaaae3674d99d72910bf /libs/androidfw/ResourceTimer.cpp | |
| parent | 65091e4cac5096fa392ebd3b2d775253bbe5beb6 (diff) | |
| parent | aebe4548c2a14ba744abf13b2f5f9d652f682e16 (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: aebe4548c2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212
Change-Id: Idee945414daa7ab0de397e6af369c8775801a9bb
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