tree 2ea3d583bb5b02cf76a0d258e68c3605fdd54fa5
parent 20d873f4618980ba80ebf471c5b49d7301578642
parent 1d7a55668e0a36a7ab150db2df4007dd5810bde8
author Sunny Goyal <sunnygoyal@google.com> 1431381639 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431381639 +0000

am 1d7a5566: Merge "When updating an icon, keeping the drawable padding same as before" into ub-launcher3-burnaby

* commit '1d7a55668e0a36a7ab150db2df4007dd5810bde8':
  When updating an icon, keeping the drawable padding same as before