tree dc9c06e606192212cd5946bb99f059b53c0a4b63
parent 4e87709b8b41a12d6caf2bd1110beed20e5b88e5
parent f2c1c09683a5cfa23e8394fe5a10e84803f4168b
author Deepanshu Gupta <deepanshu@google.com> 1425326187 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425326187 +0000

am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev

* commit 'f2c1c09683a5cfa23e8394fe5a10e84803f4168b':
  Correct PorterDuff filters.