tree e2842b9dcb8ce96d88e98183a29b7ad94ab5e6aa
parent 63b328bdebf171a90dacaa10aad6377608c19fcf
parent 73821c8d2bd453de6bf3f516e1f1cdb9a132f4a7
author Chris Craik <ccraik@google.com> 1410973294 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1410973295 +0000

Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev