summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2022-09-15 17:37:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 17:37:52 +0000
commit13ac3a30cc915e0e0846555a2740fa3a02a6edcc (patch)
treeeef72657a057e27b265e8068a670decb4a87b1a8 /libs/androidfw/ResourceTimer.cpp
parent07afb475071761f8a473ae642d76f9aedc455dea (diff)
parent2ebce335cc2324ce1c0134b83d7110b5ac6f4a15 (diff)
[automerger skipped] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: c27cf661a6 am: 2ebce335cc -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952027 Change-Id: Id78dd57dede71747a52ff0262ea301dbaf795698 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