diff options
| author | 2022-09-15 19:54:36 +0000 | |
|---|---|---|
| committer | 2022-09-15 19:54:36 +0000 | |
| commit | 830e7e5af61e69efc70cfd1e29cb1a819d69bac4 (patch) | |
| tree | b2f700a4a55b9b7fb722d2fa15e43b2bf9e4ce38 /libs/androidfw/ResourceTimer.cpp | |
| parent | d673d224ee4b2332c85c2dbc18b392a8418f57d1 (diff) | |
| parent | 31a5f9dae577441e4d37c5f3e7a67f8ac8076bdb (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101
Change-Id: If570eacf315e88dbeb118edcdc0b66c4e15796d3
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