diff options
| author | 2022-09-15 20:23:05 +0000 | |
|---|---|---|
| committer | 2022-09-15 20:23:05 +0000 | |
| commit | 43d027b69b518a904dccbf4c0364f8e76629d3ce (patch) | |
| tree | b7f70b18d8f0e92c1c4fa37d1e9f061b4be5c9f4 /libs/androidfw/ResourceTimer.cpp | |
| parent | 3eaa0883f917d3705980dd2b8f18398d25654cdc (diff) | |
| parent | d7cf9b4bcbb6f5e6be6abf792b55eba1af2f6254 (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: c3657db71e -s ours am: d7cf9b4bcb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101
Change-Id: I2e3569f63c2b49925a818b844cd6d85eb767d074
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