tree f252be10b627dad3f14dcb3da6dfb60f38e12c62
parent 34b52e5806f4ab426199311b7e03a040a7a9321a
parent 2a83056e2e5b08c536986ea4ff0c46e9277a12c9
author Pinyao Ting <pinyaoting@google.com> 1694119024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694119024 +0000

[automerger skipped] Merge "Fix NPE when fetch shortcut icon uri" into udc-dev am: 318e1df16f am: 2a83056e2e -s ours

am skip reason: Merged-In I7a2e85c703d2758f89b0c06d898f9423d6764444 with SHA-1 a1c34f0aac is already in history

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

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