tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 759d07575ac8c23b36f8be1ee2445edfbecc6ed7
parent 13d8d2d6682fbfba3262d1485c6cebf9665d751e
author Winson Chung <winsonc@google.com> 1392411597 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411597 +0000

am 13d8d2d6: am c270b8d9: am 44dfaf26: am 6eabacd4: am 140e79bb: Merge "Workaround for small icons. Draw icon drawables at the expected icon size. (Bug 11203738)" into jb-ub-now-indigo-rose

* commit '13d8d2d6682fbfba3262d1485c6cebf9665d751e':