tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 575937508171ed19bc943615e25d45efd21cbcbf
parent c5dd0996cdc0d34a790c2dccb3d9ed9429ce4d07
author Winson Chung <winsonc@google.com> 1392411132 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411132 +0000

am c5dd0996: am 28c9b3d2: am 540514f3: am e5467dcc: Flushing icons of the wrong size. (Bug 11203738)

* commit 'c5dd0996cdc0d34a790c2dccb3d9ed9429ce4d07':