OSDN Git Service

Merge "Change drag from shortcuts to say "Cancel" instead of "Remove"" into ub-launch...
authorTony Wickham <twickham@google.com>
Tue, 9 Aug 2016 22:06:55 +0000 (22:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Aug 2016 22:06:55 +0000 (22:06 +0000)
am: 1d69de8f77

Change-Id: If5f4a7d6f302ff79edb36e348e1aba041671ed76


Trivial merge