summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ganesh Olekar <olekarg@google.com> 2022-08-25 00:40:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-25 00:40:22 +0000
commitdda6807d9d8154396ff7ee06f403e307d9f8db47 (patch)
tree77c0a2be44399ff0e711993d77c692d4dbaad9cc /libs/androidfw/ResourceTimer.cpp
parent169d5005ec2b7cb3fa8859b88098b8f8003de0fd (diff)
parent2dc939f8bf8608080df8eb15a72d811705670b47 (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: 07acb763a7 -s ours am: d5397bc42e -s ours am: a088b65321 -s ours am: 2dc939f8bf -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125210 Change-Id: I3213a8c4febf504694df00d61f50fc4bfbac3752 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