summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ganesh Olekar <olekarg@google.com> 2022-08-24 20:10:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 20:10:54 +0000
commitaa439c54c7d9f8f7af2e8bcd4a5baa0560b35694 (patch)
tree48ec28d1a964e01c4f0f7e906d9d3c17ea700855 /libs/androidfw/ResourceTimer.cpp
parenta77b876af0faa220f4c2b6ba5ac3aae263f9c389 (diff)
parent07c814465e8a5e8f5506a15b574e5df661140d7c (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: 286e43d25d -s ours am: bba1622650 -s ours am: 07c814465e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125908 Change-Id: Iefed11b6a10f44ab11fa073030c6f5a779e4a5b0 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