tree ae07c115705c1601f8968d7ed6c880274c0afa43
parent 64624c80fce0162c1711e79abfa28043bd917db6
parent 1ba0e4df79436e89b52491115286214dd631ecc0
author Tony Wickham <twickham@google.com> 1470780234 +0000
committer android-build-merger <android-build-merger@google.com> 1470780234 +0000

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

Change-Id: I6f9f706457aecb7b74286022cfff391942931383