Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60
am: c504d93894
am: c92052d2c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346 Change-Id: I940dd05134239de744fcac801676319af661ba23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: