summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ganesh Olekar <olekarg@google.com> 2022-08-24 19:14:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 19:14:56 +0000
commitbba162265071811e70651e35a6e08c4e481b08e7 (patch)
treee680dee6eccac73738f9c7d8b325f74fc6f62732 /libs/androidfw/ResourceTimer.cpp
parent80f99e8a614c1bfb703a39ff28c718559de6ef44 (diff)
parent286e43d25dde6b9a40a3745d98ce542049f5c527 (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: 286e43d25d -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125908 Change-Id: Ib703e7ab4478cace17f6e6afab879f9b85a69611 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