tree cba62d0d64153aa2169651696bc238591341d679
parent 611bf52add01a7df372589aa380155b90f84016b
parent 13d8d2d6682fbfba3262d1485c6cebf9665d751e
author Winson Chung <winsonc@google.com> 1414085348 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085348 +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':