summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2022-09-15 18:35:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 18:35:23 +0000
commite06f474627cb736e516fae19d5a4edd273859b1e (patch)
treea7c71290ba20457dc4dfd87c7b76505362738935 /libs/androidfw/ResourceTimer.cpp
parentaff81a5527cfc53ad97ee65f1068d29df67cb730 (diff)
parent65ea1811cac1e6f3e6fde516495a72617bca5f68 (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: 7ef1e5f3a7 -s ours am: 65ea1811ca -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952027 Change-Id: I483fd690c9ee94385cf7bfa99b12f0bf27b489b1 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