tree cba62d0d64153aa2169651696bc238591341d679
parent e68cc516eebeab58d2c76c0d612490cab2f1b287
parent 06db554e4b3b60e1dbf1ce4da72f343417587b25
author Winson Chung <winsonc@google.com> 1414085353 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085353 +0000

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

* commit '06db554e4b3b60e1dbf1ce4da72f343417587b25':