summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2022-09-19 19:01:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-19 19:01:38 +0000
commit3493f307ba6045431edb32e41954d2633d704cd7 (patch)
tree1f5e1155f9cb5f5edb2150e37677db5e0d026f92 /libs/androidfw/ResourceTimer.cpp
parente403afd1c6ef9b81113988a324429d55fd560f4d (diff)
parent65091e4cac5096fa392ebd3b2d775253bbe5beb6 (diff)
[automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5df6 -s ours am: 65091e4cac -s ours
am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f113 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19990545 Change-Id: Id7382f128d5b22538e3fadb72474bd71047c86aa 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