tree fa5a27755198eef7d655bfa851a497a1a7418c0c
parent a07b9335e437d69cb5c216cbc7fbde1d9a35112e
parent c980735560ddc21544203f83663e9ca1108cf80c
author Tony Wickham <twickham@google.com> 1474591034 +0000
committer android-build-merger <android-build-merger@google.com> 1474591034 +0000

Merge "Stop jumping to workspace from hotseat on quick drop." into ub-launcher3-calgary-polish
am: c980735560

Change-Id: Ief6ebc05301a56cf56a72acc433f9ee4a2e60fb3