tree d54bfa42e12c314c9f0bf394e5cc79bf3da43800
parent 0765fc4d8b5ed1b23f1cda10137cb3ae99e41928
parent b3c34125a483b321bd91025f88058c58844cde2e
author Winson Chung <winsonc@google.com> 1392411233 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411233 +0000

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

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