summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ganesh Olekar <olekarg@google.com> 2022-08-24 23:33:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 23:33:52 +0000
commitd5397bc42eb4d96414b2572f3c64c41d880c1282 (patch)
tree18e7ce3bf1541843cf12045906eb17387acf93e7 /libs/androidfw/ResourceTimer.cpp
parent46991d960b1b587709355356043b13637214ef77 (diff)
parent07acb763a749c08ea43a3ee4235265addb82aba7 (diff)
[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-dev am: 1ee3c74d2e am: 362c47c6e7 -s ours am: d06f5f0f74 -s ours am: 07acb763a7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125210 Change-Id: I688e9b0e3dcc0b28bca798570e621038b8798916 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