summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Wenhao Wang <wenhaowang@google.com> 2022-11-01 23:04:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-01 23:04:34 +0000
commit35b291a302fb6da96425705f1244cf1ef832bd0d (patch)
tree4a4b468d51fdb075b571c603c565d395d5a5ebad /libs/androidfw/ResourceTimer.cpp
parentceb1056a05bbd04272c837e118ba144b7565fd34 (diff)
parent064698cd7405a55912090ab444f7a7eeb90ea7b1 (diff)
[automerger skipped] Merge "Enable user graularity for lockdown mode" into rvc-qpr-dev am: 5a1a9ba40a -s ours am: ab80f82cdf -s ours am: 682b7ec427 -s ours am: 2e934c5d80 -s ours am: 52167fe15d -s ours am: 8dcf17ad16 -s ours am: 064698cd74 -s ours
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 0b56ec9aa2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20192647 Change-Id: I04cbc4800833aed2d3fae3fe6b2e2cbbb2154bf8 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