tree ae07c115705c1601f8968d7ed6c880274c0afa43
parent ea5bcba847a5740b29485ea40d2419841c8cd62c
parent df64e9ee06bc8dde8ad5ca3156adf8e0f27e0c9e
author Tony Wickham <twickham@google.com> 1470779562 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1470779563 +0000

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