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