tree 11cd9ece237f7cb419ce42b9c0e9f4a785dbd131
parent e529ea426ecd2b5da3064d8ef3bdbac53520a5c1
parent 4e458aca821ff8863ffbf1475af15b621deef964
author Chris Craik <ccraik@google.com> 1410974822 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410974822 +0000

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

* commit 'befbdaba72a2c1502ff6135a8214f7434a6b2ea7':
  Handle premultiplication correctly for ColorMatrixColorFilters