summaryrefslogtreecommitdiff
path: root/libs/hwui/FrameInfoVisualizer.cpp
diff options
context:
space:
mode:
author Hongwei Wang <hwwang@google.com> 2023-07-27 02:32:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-27 02:32:18 +0000
commit2d8f49be01f1cbd1b95545925500adf98cee56b3 (patch)
tree2d77a65787cc1e2bd1c97240c8b598cffecbafe0 /libs/hwui/FrameInfoVisualizer.cpp
parent7a5e186f5d665612ee2d3ffc558bb99d0e7019ec (diff)
parent8231396c2b3df7fe34f2f3da1aae33ad8c379a31 (diff)
[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into sc-dev am: 1f2e080f1b am: 0fbf93b9f6 am: 31262f43e4 -s ours am: 9c653875b2 -s ours am: aa0362b18f -s ours am: a83ed7318c -s ours am: d10ccc376d -s ours am: 728219a5b5 -s ours am: 8231396c2b -s ours
am skip reason: Merged-In Ib3f5b8b6b9ce644fdf1173548d9078e4d969ae2e with SHA-1 1aee65603e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23423703 Change-Id: I4c7566290085138b32e14d50e7018b203760a54e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/hwui/FrameInfoVisualizer.cpp')
0 files changed, 0 insertions, 0 deletions