summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ganesh Olekar <olekarg@google.com> 2022-08-24 19:49:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 19:49:52 +0000
commit8a092df896a5bb4d866a70471fa72ec284014503 (patch)
tree0dd68b791f55052f6b68f1e1885289a0c8fe0056 /libs/androidfw/ResourceTimer.cpp
parent4f5459abc9c9f3b5e6850fdc64876c96d1bab9d0 (diff)
parent9fc3dfe4565d9b5c6774d129f6556d94541e5298 (diff)
[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-qpr-dev am: 29a03aa05c -s ours am: 706fdb063a -s ours am: 9d383010c5 -s ours am: 9fc3dfe456 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125908 Change-Id: I16e7f584e2c4887fbc2e251d5bb00ac8de80de6d 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