Merge "Truncate ShortcutInfo Id" into udc-dev am: 2ab75a7742 am: 119e5297b6 am: 77b3ea560e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22766260 Change-Id: I7097864e083a60694e83d86918c2b8c12fdad208 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: