diff options
| author | 2022-09-15 19:03:44 +0000 | |
|---|---|---|
| committer | 2022-09-15 19:03:44 +0000 | |
| commit | 841bc866be3282f3a976620250a4b56e4ea55e3e (patch) | |
| tree | aaad0f522949f03b857632c12b865488216c9b0b /libs/androidfw/ResourceTimer.cpp | |
| parent | 158a067a2cdecec4ff1eb8fdd57140068db392d5 (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: I36135056c4c895491c7a76d4c50a93acb5e261f1
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