tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent f1ecf4997904664be1dd9e7555f40df4647c2c4d
parent c270b8d9fdf870327d3d3b34be219a55cfb22270
author Winson Chung <winsonc@google.com> 1392411129 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411129 +0000

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 'c270b8d9fdf870327d3d3b34be219a55cfb22270':