tree e35ce4a763103520dcc62c82222bf5a6b454481c
parent 622758922b95a37428d7af6912983ce1f452cfda
parent 371b582c4941a7c4a1a5531fa8768db74354b616
author Alan Viverette <alanv@google.com> 1433550549 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433550549 +0000

am 371b582c: Merge "Implement getColorFilter() on VectorDrawable" into mnc-dev

* commit '371b582c4941a7c4a1a5531fa8768db74354b616':
  Implement getColorFilter() on VectorDrawable