[automerger skipped] [automerge] Truncate ShortcutInfo Id 2p: ab0c8ac5b4 am: 4bc48527c0 -s ours am: c44c03297d -s ours am: f797cc1da7 -s ours am: 5f46214a60 -s ours am: 20f7f005c9 -s ours
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 fee62a33da is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22905557
Change-Id: Id3cf9af23f934da8980b06e194a99f4f07d8e24c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
3f2abe27a0