diff options
| author | 2022-09-15 20:21:11 +0000 | |
|---|---|---|
| committer | 2022-09-15 20:21:11 +0000 | |
| commit | bf675c6c6e711440d21fa9845a57bd1ebfb34128 (patch) | |
| tree | ecb3111aa9ab02885ffaad6655e0aeed769e7844 /libs/androidfw/ResourceTimer.cpp | |
| parent | e150580b91fa8edf490fd208d5187a1d2bf83cd5 (diff) | |
| parent | ef6cd96352c6ff95b522717b96f1ef77f4e86644 (diff) | |
[automerger skipped] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: c27cf661a6 am: 2ebce335cc -s ours am: 13ac3a30cc -s ours am: 7ef1e5f3a7 -s ours am: 65ea1811ca -s ours am: e06f474627 -s ours am: e9ccd9db50 -s ours am: ef6cd96352 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952027
Change-Id: Ie73e2addb44e357f53cc64ca9546e6f121fd408d
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