summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> 2022-09-15 18:35:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 18:35:08 +0000
commitaff81a5527cfc53ad97ee65f1068d29df67cb730 (patch)
treea7c71290ba20457dc4dfd87c7b76505362738935 /libs/androidfw/ResourceTimer.cpp
parentd05aafbcbfbe3e0de02656635dd9bf2362d73bed (diff)
parentc64e0d7063c86f915e09a756814f0a9abd0725fd (diff)
[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f113 am: 1bc514701a -s ours am: c64e0d7063 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101 Change-Id: Ida234c7845a92b984104060fc0176e678584b0e3 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