diff options
| author | 2022-09-15 19:53:45 +0000 | |
|---|---|---|
| committer | 2022-09-15 19:53:45 +0000 | |
| commit | cf9d368b6de25991f0c496bc6f6411ec77484cff (patch) | |
| tree | 240b53504584725edd9e343b2dd8fedcb380521c /libs/androidfw/ResourceTimer.cpp | |
| parent | d8449242240e992edb4eed3f8f13ddfc17e3b590 (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: I7b3d804106f956d1af6da57da53f06e752f170a5
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