tree ae07c115705c1601f8968d7ed6c880274c0afa43
parent b723fcd217b2aef57b968e64b8a4a49f80a1d0ea
parent 1d69de8f77440429526e486d98c33e16e1a8d721
author Tony Wickham <twickham@google.com> 1470780415 +0000
committer android-build-merger <android-build-merger@google.com> 1470780415 +0000

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

Change-Id: If5f4a7d6f302ff79edb36e348e1aba041671ed76