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