[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 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: Ic3dcf06c95e825db3ee090c654cd055a26a299bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: