tree 82451f59669df135f62272fc431276f7bb275042
parent e892214dccbb3c26ae840b793a97be08f5297c61
parent a926343d5c567b8cf32175530b1f6eb574e7eabc
author Sunny Goyal <sunnygoyal@google.com> 1431973554 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431973554 +0000

am a926343d: Merge "Preventing relayout when loading high-res icons" into ub-launcher3-burnaby

* commit 'a926343d5c567b8cf32175530b1f6eb574e7eabc':
  Preventing relayout when loading high-res icons