tree f18bee7e6b1b18da7e1e48569b638705ead59dad
parent 4c17d3ffec402db917170751ab45ca40a581c17a
parent 71538da6e2e70af15684cc270a6e67c9b5a010dc
author Tony Wickham <twickham@google.com> 1469666763 +0000
committer android-build-merger <android-build-merger@google.com> 1469666763 +0000

Merge \"Cleanup deferred drag when closing deep shortcuts container.\" into ub-launcher3-calgary
am: 71538da6e2

Change-Id: I683a03e3c72dd3d541ec7d6ee5c14105815cba91