tree d54bfa42e12c314c9f0bf394e5cc79bf3da43800
parent a7f80c8647c4a614c87c4265d9434557b029e10f
parent 3907f60dfae08d65a15e649ba9acf224f264192a
author Winson Chung <winsonc@google.com> 1392411700 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411700 +0000

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

* commit '3907f60dfae08d65a15e649ba9acf224f264192a':
  Use the icon bounds for all calculations.