tree 652509acd344f73c18b73203e791f2db9b59e04f
parent 3ebda73095ec765b35fe724387266ef40a72bbb2
parent d4c4d946ae830fbd0f4486f5205be912ef84a1f5
author Selim Cinek <cinek@google.com> 1524452341 -0700
committer android-build-merger <android-build-merger@google.com> 1524452341 -0700

Merge "Made the DrawableWrapper return the right ColorFilter" into pi-dev am: cf893ac40c
am: d4c4d946ae

Change-Id: I064ead2161ed1c1a0b91141fdf828eb6c9d7ce1d