summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-09-02 21:36:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-02 21:36:13 +0000
commitd9623d86e20931282a6097b1174c3383b10359e7 (patch)
tree8dec3b4a3c913ce9ed9b605b6db18a87e9801ff1 /libs/androidfw/ResourceTimer.cpp
parent0bfae97bf25fb560f03e63d73a426668f391b917 (diff)
parent226334a2dcf3eef878bcc415e58fb0125e7e5c1c (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500530 Change-Id: Ib26123c81f95be71c73eb752742af03f92143d47 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