summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ganesh Olekar <olekarg@google.com> 2022-08-24 23:52:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 23:52:23 +0000
commit4dcde38cca93a0ac5e4e54ad96905f98ae2deee6 (patch)
tree0dd68b791f55052f6b68f1e1885289a0c8fe0056 /libs/androidfw/ResourceTimer.cpp
parent63b0977b8175cd21ad3ce3f4be96bd8b99c01e39 (diff)
parentfe73c5d7a4f2cb72147153172a94bf3f86534895 (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125210 Change-Id: Ifc8516b9f619ff459c7290c2d62b2fa57119dbb3 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