summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ganesh Olekar <olekarg@google.com> 2022-08-15 11:25:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-15 11:25:03 +0000
commitebcf70b06ffcca42bd5c676d754b068867e022ba (patch)
tree67922affb514fc0c94a141708bc22e424e379597 /libs/androidfw/ResourceTimer.cpp
parent07dab0c6858d4c87383bec11cef48e91e49bbae2 (diff)
parent516b24e8bd007c9329a30696f85417f65e724557 (diff)
[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 am: dc45b9fed3 -s ours am: 0f8fc1a47e -s ours am: e0cb2beeae -s ours am: 191abef1fa -s ours am: 108fb60e32 -s ours am: 516b24e8bd -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410 Change-Id: I399a9a12b38e1398dfe87ad369cc3fb927f062b4 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