diff options
| author | 2022-09-15 20:20:58 +0000 | |
|---|---|---|
| committer | 2022-09-15 20:20:58 +0000 | |
| commit | 0a4e57e179a890bfab4884e6e83e55f9fbd2b2fb (patch) | |
| tree | ecb3111aa9ab02885ffaad6655e0aeed769e7844 /libs/androidfw/ResourceTimer.cpp | |
| parent | e150580b91fa8edf490fd208d5187a1d2bf83cd5 (diff) | |
| parent | cf9d368b6de25991f0c496bc6f6411ec77484cff (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: cf9d368b6d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101
Change-Id: I8d346b080cb10a7b50b9860ba1215935df7938a3
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