tree 393976badc86455ee213ce4ab745aff2b7e6c744
parent d3d90964879d8065260306c63d4479b0236fed48
parent cd7e3d859dfb710a477c80aa78e0f77ac24c0890
author Tony Wickham <twickham@google.com> 1470691224 +0000
committer android-build-merger <android-build-merger@google.com> 1470691224 +0000

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

Change-Id: I4af6af2f11c9938bdd1d6caacb6854e6292b7d9c