tree 3611e0ab6306cfee4bcc4ca17e13863e1b6954dd
parent 3155e348565736e480174bf46e1a06a0fcdda609
parent af2637376f5fb37d1dfa598a8c95a623367501ce
author Winson Chung <winsonc@google.com> 1436830716 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436830716 +0000

am af263737: Merge "Fixing regression in calculating workspace padding." into ub-launcher3-burnaby

* commit 'af2637376f5fb37d1dfa598a8c95a623367501ce':
  Fixing regression in calculating workspace padding.