Merge "Change drag from shortcuts to say "Cancel" instead of "Remove"" into ub-launcher3-calgary

am: 1ba0e4df79

Change-Id: I6f9f706457aecb7b74286022cfff391942931383
This commit is contained in:
Tony Wickham 2016-08-09 22:03:54 +00:00 committed by android-build-merger
commit 1d69de8f77

Diff Content Not Available