tree 5e8b420d44c964e7136e43c9386127db746c1981
parent 0b38a9447a6e146132922ab18862b96534f3e968
parent 3a7bea59817342575cb8cba7c3307dc7b3c159e1
author Winson Chung <winsonc@google.com> 1392410273 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410273 +0000

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

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