tree 993403e643d6f47a8dd812517626a8d4678365f1
parent ab652a225a333861bd1d4ab2d9a896fa236be660
parent 28ad58478e6b0034ce8c6a775a18ee253e6657f4
author Sunny Goyal <sunnygoyal@google.com> 1425938045 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425938045 +0000

am 28ad5847: Merge "Adding a scrollable folder content implementation" into ub-launcher3-burnaby

* commit '28ad58478e6b0034ce8c6a775a18ee253e6657f4':
  Adding a scrollable folder content implementation