summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ganesh Olekar <olekarg@google.com> 2022-08-24 20:12:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 20:12:24 +0000
commit282d65c9c41e25f045614e3f4108bf78e103b801 (patch)
tree48ec28d1a964e01c4f0f7e906d9d3c17ea700855 /libs/androidfw/ResourceTimer.cpp
parent9a9879db4444db3b8e3d3b66fcf605b9898c50f9 (diff)
parentf6558a34739c164b7b90a711d5ded7bef6c917c0 (diff)
[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-qpr-dev am: 29a03aa05c -s ours am: 706fdb063a -s ours am: 9d383010c5 -s ours am: 9fc3dfe456 -s ours am: 8a092df896 -s ours am: f6558a3473 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125908 Change-Id: Ic2e60857bc7a4638df492cb1676f5cf27c6586f4 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