Merge "Change drag from shortcuts to say "Cancel" instead of "Remove"" into ub-launch...

author Tony Wickham <twickham@google.com>

Tue, 9 Aug 2016 21:52:42 +0000 (21:52 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 9 Aug 2016 21:52:43 +0000 (21:52 +0000)
author Tony Wickham <twickham@google.com>
Tue, 9 Aug 2016 21:52:42 +0000 (21:52 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 9 Aug 2016 21:52:43 +0000 (21:52 +0000)
diff --cc src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
Simple merge
author	Tony Wickham <twickham@google.com>
	Tue, 9 Aug 2016 21:52:42 +0000 (21:52 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 9 Aug 2016 21:52:43 +0000 (21:52 +0000)