summaryrefslogtreecommitdiff
path: root/libs/hwui/FrameInfoVisualizer.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-10 03:29:08 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-10-10 03:29:08 +0000
commita21486ccf67df8d85e9cc374afadd922edbf1a06 (patch)
tree087fbef3111eaf7e5554ebbe08806f3be467372c /libs/hwui/FrameInfoVisualizer.cpp
parent67b7ac809c4d33d6748b985363b53ec65986028d (diff)
parentd4c01f1d76d331a77fce29954b75d6b304e0014e (diff)
Merge changes from topic "am-24d669f090ff4a82b5a941e0f950c814" into udc-dev
* changes: [automerger skipped] Merge "Check URI permissions for resumable media artwork" into tm-dev am: 074556ad07 -s ours am: df79b90909 -s ours am: a35f2dc5f4 -s ours [automerger skipped] Check URI permissions for resumable media artwork am: a3b7a10a15 -s ours am: 2d8473d07f -s ours am: 10137fbdb8 -s ours
Diffstat (limited to 'libs/hwui/FrameInfoVisualizer.cpp')
0 files changed, 0 insertions, 0 deletions