diff options
| author | 2022-09-15 19:54:06 +0000 | |
|---|---|---|
| committer | 2022-09-15 19:54:06 +0000 | |
| commit | ef6cd96352c6ff95b522717b96f1ef77f4e86644 (patch) | |
| tree | b2f700a4a55b9b7fb722d2fa15e43b2bf9e4ce38 /libs/androidfw/ResourceTimer.cpp | |
| parent | fd2105e9ac657aa102212c961cd1b0ccd39f2141 (diff) | |
| parent | e9ccd9db503336f5af1c6558c74fa96cbde8db51 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952027
Change-Id: I7ee1cecef8960b97ddd47dd8fdb405e1c4d5f127
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