tree d242f593104fca8a2d6002e08f031e34aa0b140b
parent 8d4a5db6dcb120f23eeca7518f479daed6552aeb
parent bcae8f0272f4e1c7a8736de22d96924759cbc3c6
author Sunny Goyal <sunnygoyal@google.com> 1431385226 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431385226 +0000

am bcae8f02: Merge "Updating folder grid sizes for various devices" into ub-launcher3-burnaby

* commit 'bcae8f0272f4e1c7a8736de22d96924759cbc3c6':
  Updating folder grid sizes for various devices