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:08:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 18:08:16 +0000
commitc64e0d7063c86f915e09a756814f0a9abd0725fd (patch)
tree00fe37170748b1fd3b235d37baef22268e641f8a /libs/androidfw/ResourceTimer.cpp
parente53e389f587a78793c78cd3a93fd1078e0c55232 (diff)
parent1bc514701aaaf98d2d3e226130cde9b4b03026b6 (diff)
[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f113 am: 1bc514701a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101 Change-Id: Ie5532e100550268fe9e2e6b873cfd276973683ce 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