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