summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Wenhao Wang <wenhaowang@google.com> 2022-11-01 23:05:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-01 23:05:27 +0000
commit006c3303bcc714a7c7b4a2f4e705a4c482cbb312 (patch)
tree4a4b468d51fdb075b571c603c565d395d5a5ebad /libs/androidfw/ResourceTimer.cpp
parentc3571a9ccd127f0f6e1f95bcd8a96139fdee57f3 (diff)
parent5e0b472752331339bfb0dc588a3d72d69167b4a1 (diff)
[automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-dev am: abf1cfa4ec -s ours am: f6f4800b6c -s ours am: 08e240c3b1 -s ours am: aba2a82d08 -s ours am: 1ce1c06835 -s ours am: 8724128895 -s ours am: a0d9e59656 -s ours am: 5e0b472752 -s ours
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20193625 Change-Id: I2e7649c0c3b29c39a553ace5efe0f7a01c79a1db 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