tree 386a656ba72175ef999051f2fe1980334f3c674c
parent d96693806f024b92a48abbe86af0a02073abeec3
parent ba9d58516cbd544df67454922c23b0597fc01fcf
author Chris Craik <ccraik@google.com> 1410973860 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410973860 +0000

am b5a27aee: Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev

* commit 'b5a27aee532343a3c66d91c04c8d238ff35b31db':
  Handle premultiplication correctly for ColorMatrixColorFilters