tree 10da860fcff71886af91d082e31f0e1917926848
parent eea4e91a093d6391a7cf033fa3b7f591e98469e8
parent 991e76a8a309c1982bc6f9e125a65b806d626762
author Winson Chung <winsonc@google.com> 1414566359 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566359 +0000

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

* commit '991e76a8a309c1982bc6f9e125a65b806d626762':