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