summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ganesh Olekar <olekarg@google.com> 2022-08-31 02:27:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-31 02:27:32 +0000
commit82bd3a2026692c656bce8be0e1f1aaba0f3e05df (patch)
treec66dad66c45d8854da0eb2ad69d11653093b176b /libs/androidfw/ResourceTimer.cpp
parenteb1dbbc5245cdd07b495b51249657091775e29b6 (diff)
parent6c0a6e83339a7265d3eb5d856f7602563b595fdf (diff)
[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into sc-dev am: 391cabb10c am: 708c29db10 -s ours am: 7902b42dfe -s ours am: 8a6629d33d -s ours am: 6c0a6e8333 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500370 Change-Id: I511d7932b366f489ed15e183cc73e8024303b391 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