diff options
| author | 2022-09-15 20:23:40 +0000 | |
|---|---|---|
| committer | 2022-09-15 20:23:40 +0000 | |
| commit | d0118289eb546a2ab95c892fdb3892b28060f0f4 (patch) | |
| tree | b7f70b18d8f0e92c1c4fa37d1e9f061b4be5c9f4 /libs/androidfw/ResourceTimer.cpp | |
| parent | 43d027b69b518a904dccbf4c0364f8e76629d3ce (diff) | |
| parent | 830e7e5af61e69efc70cfd1e29cb1a819d69bac4 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into sc-dev am: d1afd041a1 -s ours am: 582d8e0262 -s ours am: 50f0b58d80 -s ours am: 5933a823ea -s ours am: 31a5f9dae5 -s ours am: 830e7e5af6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101
Change-Id: I2f96a1a3da505926e350fe5ba382ddb6576f86e1
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