tree cba62d0d64153aa2169651696bc238591341d679
parent 31e68c7e692c53be8925036ca6b671c64c516700
parent 3907f60dfae08d65a15e649ba9acf224f264192a
author Winson Chung <winsonc@google.com> 1414085480 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085480 +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':