summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Miranda Kephart <mkephart@google.com> 2024-10-01 16:24:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-10-01 16:24:04 +0000
commit836662957b4b3d42b73b3ec8a1ed1c80dfcf741e (patch)
tree493b6eddead9c625938570f73595ebca269c99ad /libs/androidfw/ResourceTimer.cpp
parent4c2f6054cc0ea35bf7b70389dcfa9297ca2f5bff (diff)
parent14fa46317faa1bae958bc61728fb3d773b3dba84 (diff)
[automerger skipped] Merge "Block clipboard UI when device is locked" into udc-dev am: d6d617e23a am: 14fa46317f -s ours
am skip reason: Merged-In I1a48cbe64852dce3fba69915ca11dad8878f66eb with SHA-1 a79e9e542a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29282850 Change-Id: I1b3ed1b503f63d82c3606475b46289363fd880db 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