summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-20 10:25:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-20 10:25:44 +0000
commit578bc706556db7dfee7e991e610b6ea1da3c6ce4 (patch)
tree65e1358bf8c677a85c631bd0cdeaa641403da81c /libs/androidfw/ResourceTimer.cpp
parent10d2c1f67730615d9a987b8a19eea76cfcf63530 (diff)
parent77955b229e62f9df2acf681620ea753270349929 (diff)
[automerger skipped] Require permission to unlock keyguard am: 55b8322714 -s ours am: 77955b229e -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342146 Change-Id: Ie6397df08e39013530ebb1f3529c94dc36ec2fb2 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