diff options
| author | 2022-09-15 19:05:33 +0000 | |
|---|---|---|
| committer | 2022-09-15 19:05:33 +0000 | |
| commit | e9ccd9db503336f5af1c6558c74fa96cbde8db51 (patch) | |
| tree | 65b66ec2ee1099db7be3c862682ca6d0f75fc728 /libs/androidfw/ResourceTimer.cpp | |
| parent | 1b1dc203ba38f5e2a616fcb39ed31720786e87a6 (diff) | |
| parent | e06f474627cb736e516fae19d5a4edd273859b1e (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952027
Change-Id: I934e430709e44d54d6790d19e5beb392ee9446e2
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