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:03:54 +0000 (22:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Aug 2016 22:03:54 +0000 (22:03 +0000)
am: 1ba0e4df79

Change-Id: I6f9f706457aecb7b74286022cfff391942931383


Trivial merge