tree 02fc996288a5401171a281a7d386b5afbc81888f
parent df0ca773b456b7485626db738a5d67710f0a0ff3
parent 7c01c0917644f089285c787bd8fdce12729d2d72
author Ioana Alexandru <aioana@google.com> 1683721706 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1683721706 +0000

[automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions for notification shortcutIcon."" into rvc-dev am: d402a8dd75 -s ours am: 7e10a4e650 -s ours am: c2d4e9d887 -s ours am: 52cac04fae -s ours am: 7c01c09176 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23124496

Change-Id: Ice38ca95f70e63d48f74878097f04a2425a84439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>