tree f464963e0f45f4726ff5cde30c87ca6fd5918ef1
parent 4e9096304ba16098050a4a6f3ae19b0459deafeb
parent d103d1cc75fb40d6387fd7379434ce4213498d48
author András Kurucz <kurucz@google.com> 1683215581 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1683215581 +0000

[automerger skipped] Truncate ShortcutInfo Id am: f31df62340 -s ours am: d0b98bc699 -s ours am: 657eef512a -s ours am: 1c9b60abeb -s ours am: b91728596a -s ours am: f0d3de3106 -s ours am: d103d1cc75 -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: I61e46ba412d4e31c158131ce09467a040eb7da4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>