summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ganesh Olekar <olekarg@google.com> 2022-08-24 19:51:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 19:51:31 +0000
commitf6558a34739c164b7b90a711d5ded7bef6c917c0 (patch)
tree9f51c1fdbddc598a5c60baf4817234a90d3a1c05 /libs/androidfw/ResourceTimer.cpp
parentc69a5bfd3cd11ff62bf01c4a92827bcfd22e7e56 (diff)
parent8a092df896a5bb4d866a70471fa72ec284014503 (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125908 Change-Id: Ie2c4ac3384c4cd442bdc1ab2ef63db5ecb72d4ca 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