summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2022-09-15 17:39:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 17:39:04 +0000
commitecca4988f881c3b73584ce17cd91b6aec21df81d (patch)
tree65b66ec2ee1099db7be3c862682ca6d0f75fc728 /libs/androidfw/ResourceTimer.cpp
parent70e6061c2a9eb6f3c2e5d0fbc68ce04b15e2fda4 (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: Ic4d9526e4a3d22caff3084424e5a1d12db9ba415 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