summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ganesh Olekar <olekarg@google.com> 2022-08-24 20:20:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 20:20:40 +0000
commit085313981fc441efc99d952e845e8e9c24a136ff (patch)
tree626cd8f0b116af307c32dd7688e2f8354ac1d34a /libs/androidfw/ResourceTimer.cpp
parent724ef53fdbe4519411e0a744260ec86bce8b1b7e (diff)
parentc31a542855020766481023af77a06076df373392 (diff)
[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-qpr-dev am: 29a03aa05c -s ours am: 706fdb063a -s ours am: 9d383010c5 -s ours am: 9fc3dfe456 -s ours am: 8a092df896 -s ours am: c31a542855 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125908 Change-Id: I2f5d9edb0b64263972eae3b87cec590dc44efdc8 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