summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-09-02 22:01:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-02 22:01:37 +0000
commit8afb35b15531d1f631c93fcad43505232bd77c43 (patch)
tree1ade180348ddda3be4d3d7b7534bedbf86ed0f5d /libs/androidfw/ResourceTimer.cpp
parent935992431f4e2543caa3fbc16555359adfb9f5cb (diff)
parent9c9de8395e292a61c9a838cadcec8599b75a59cb (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: 226334a2dc -s ours am: 9c9de8395e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500530 Change-Id: I16149eb22cb427937256e7bcad31be584f5ed9c3 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