tree 7580bdf1e430155969758ca08c6a567a665dba66
parent d103d1cc75fb40d6387fd7379434ce4213498d48
parent 80074780a3d04d34c758ac81a51b9191842c24fb
author András Kurucz <kurucz@google.com> 1683213077 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1683213077 +0000

[automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-dev am: ab15dd4748 -s ours am: c8e95960f4 -s ours am: 5498223ce4 -s ours am: d0a58c8ae6 -s ours am: 8534aec6a9 -s ours am: 80074780a3 -s ours

am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history

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

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