summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-09-02 21:07:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-02 21:07:20 +0000
commitcd0ff80a1e830aac30d4953621924ba3854e308f (patch)
treebd1c5e607a540ca1379f6f3feae5aab7c11a8e4b /libs/androidfw/ResourceTimer.cpp
parent1d0b69e3065f9862026690c673371f8d37f01c11 (diff)
parent22e6321905857c9f5356f5e824550761e07c0b35 (diff)
[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into sc-v2-dev am: 6c7ca7e183 -s ours am: 22e6321905 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500530 Change-Id: I21495460a5f84c3447961c77b804cbb538c56b46 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