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