tree 10da860fcff71886af91d082e31f0e1917926848
parent 87565122d8f068bb9de74118a272896db24fa810
parent 9a07e0e61a42d9d609e3bb37b156494ecf0c73b9
author Winson Chung <winsonc@google.com> 1414566274 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566274 +0000

am 9a07e0e6: 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 '9a07e0e61a42d9d609e3bb37b156494ecf0c73b9':