tree 4936d5aff49d8ea759d5e84ff407da800374217e
parent 79dd8a9c1274a108aa6a9edfd308d40340a347ee
parent fb9ca2392894a3dea83570267f9597ac0750b9fd
author Sunny Goyal <sunnygoyal@google.com> 1429224442 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429224442 +0000

am fb9ca239: Merge "Fixing drag-n-drop for folders in hotseat." into ub-launcher3-burnaby

* commit 'fb9ca2392894a3dea83570267f9597ac0750b9fd':
  Fixing drag-n-drop for folders in hotseat.