tree 3d39b1c69fd058727a3d0540b36c30c4b4f05e26
parent 50ca152dbc461e93f9351e764e5e115fe103711e
parent e9381d60cc18bac394c1e59196cf764bb3a49527
author Tony Wickham <twickham@google.com> 1469575623 +0000
committer android-build-merger <android-build-merger@google.com> 1469575623 +0000

Merge \"Remove hover-to-launch gesture for shortcuts.\" into ub-launcher3-calgary
am: e9381d60cc

Change-Id: I4d0353737fca963b7045be0d54c9ce1db773e3b2