tree ab76108bdc44421ae48ebfa3573ff5fa045b3513
parent b4f366ed02615ee4327143b7995b38e4a1113f01
parent 3739158bd7a41f6f8088c83de04c8bf48bc4d502
author Sunny Goyal <sunnygoyal@google.com> 1426264468 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426264468 +0000

am 3739158b: Merge "Scrolling folder during drag-drop" into ub-launcher3-burnaby

* commit '3739158bd7a41f6f8088c83de04c8bf48bc4d502':
  Scrolling folder during drag-drop