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