tree 393976badc86455ee213ce4ab745aff2b7e6c744
parent 84af784548e587e12400a941492a16f28f3189ae
parent ea5bcba847a5740b29485ea40d2419841c8cd62c
author Tony Wickham <twickham@google.com> 1470691072 +0000
committer android-build-merger <android-build-merger@google.com> 1470691072 +0000

Merge "Make padding consistent between shortcuts and the app icon." into ub-launcher3-calgary
am: ea5bcba847

Change-Id: Icfdb94eaec6cb3084023ebb40afa8feee5c14cf7