summaryrefslogtreecommitdiff
path: root/libs/hwui/FrameInfoVisualizer.cpp
diff options
context:
space:
mode:
author Ioana Alexandru <aioana@google.com> 2023-05-10 10:21:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-10 10:21:33 +0000
commit7e10a4e650179b04b300de96565b170ef86aac43 (patch)
tree3cc504d435002c573362a08e448b938c1793ec7d /libs/hwui/FrameInfoVisualizer.cpp
parente17cff534ead82b467219614ed243913b66d65a0 (diff)
parentd402a8dd75ef2fc56a95d4f4485fe38668da3d43 (diff)
[automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions for notification shortcutIcon."" into rvc-dev am: d402a8dd75 -s ours
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908034 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23124496 Change-Id: Ie66d43f60cc086a1a0e92784a93ad7b16f7fea80 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