summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-09-02 23:00:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-02 23:00:24 +0000
commit5a6f84af64f8ceb282f59095c6a3a32a8d66a1f4 (patch)
tree2d436a46bc1fc797f904ace6f1a99737a3d2a555 /libs/androidfw/ResourceTimer.cpp
parent070dadbfc53e66deec8fa46e37d9d2e6f9269a8f (diff)
parent8afb35b15531d1f631c93fcad43505232bd77c43 (diff)
[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into sc-v2-dev am: 6c7ca7e183 -s ours am: 22e6321905 -s ours am: 226334a2dc -s ours am: 9c9de8395e -s ours am: 8afb35b155 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500530 Change-Id: Ia6197ad9200f9566d97e46d743f366d91de1146e 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