diff options
| author | 2022-09-15 20:20:25 +0000 | |
|---|---|---|
| committer | 2022-09-15 20:20:25 +0000 | |
| commit | 69e113fb09034bb920fda603365d8c101cbb72ee (patch) | |
| tree | ecb3111aa9ab02885ffaad6655e0aeed769e7844 /libs/androidfw/ResourceTimer.cpp | |
| parent | a8a1b14eaedd661ce6548d814f911028c801f3eb (diff) | |
| parent | d8449242240e992edb4eed3f8f13ddfc17e3b590 (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: d844924224 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952027
Change-Id: I6e618bb1696ac5b274596fefc0df1ce1266bacc4
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