summaryrefslogtreecommitdiff
path: root/libs/hwui/FrameInfoVisualizer.cpp
diff options
context:
space:
mode:
author Hongwei Wang <hwwang@google.com> 2023-07-27 00:35:25 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-27 00:35:25 +0000
commit470bd60d9370771e543ffc73048775f740697aa9 (patch)
tree3d8819583ebba23bfe50f6be31f82e656e1af54f /libs/hwui/FrameInfoVisualizer.cpp
parent6401506ab9f4d54e7c9e8d436e1f9fecff560455 (diff)
parented04c8f63b132a96198d288e14228b9eb82312ca (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: 27fa09dcd1 -s ours am: ed04c8f63b -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: Iabbe8573cd1f164aef2fde9f56490937c0299875 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