tree d12eb3a270e15608817fb15a1551adeaea266eff
parent b6186d2bbe32405dcee7bb83f0a516fa1732e84a
parent 89ee93e0f8b6ac1ed6aefc2b940d1606f2027491
author Winson Chung <winsonc@google.com> 1384539721 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384539721 -0800

am 89ee93e0: Merge "Use the icon bounds for all calculations." into jb-ub-now-jolly-elf

* commit '89ee93e0f8b6ac1ed6aefc2b940d1606f2027491':
  Use the icon bounds for all calculations.