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