tree 38a600a51c9bef16fe21882d4c1362dfdfd6c9c6
parent 0cab75203c6d20db89845f257f29353559e3a2d8
parent f7106648dbe5994cd9a38826b4a0b3910df5ed4d
author Adam Cohen <adamcohen@google.com> 1458587040 +0000
committer android-build-merger <android-build-merger@google.com> 1458587040 +0000

Merge "Center folders slightly less aggressively than before" into ub-launcher3-calgary
am: f710664

* commit 'f7106648dbe5994cd9a38826b4a0b3910df5ed4d':
  Center folders slightly less aggressively than before