summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ganesh Olekar <olekarg@google.com> 2022-08-25 00:21:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-25 00:21:30 +0000
commit939c6dafa2c6f70e844a158b719263432215dbc6 (patch)
tree8b5c85a342e15e964637c9d32f305568bf8fbb7b /libs/androidfw/ResourceTimer.cpp
parentf763751b460115b2118bf72549fdaf98214771de (diff)
parent4dcde38cca93a0ac5e4e54ad96905f98ae2deee6 (diff)
[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-dev am: 1ee3c74d2e am: 362c47c6e7 -s ours am: d06f5f0f74 -s ours am: fe73c5d7a4 -s ours am: 4dcde38cca -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125210 Change-Id: I48b0b9d14ffc7dd6e96508f1ee5e37ec5f9bec8c 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