commit | ad1953dc15b3ad6e89545499dce0ea60ddd8cb0f | [log] [tgz] |
---|---|---|
author | Tim Murray <timmurray@google.com> | Fri Dec 06 16:11:28 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 06 16:11:28 2013 +0000 |
tree | d48d195c320ebd60b898447f1c5dc8cd4509d233 | |
parent | e64001c7aad2bd329e67cc2e1d7bd3b296159e25 [diff] | |
parent | 37580d58f2c132d0437a0b5c87e9ffb9a5bc7db2 [diff] |
am 37580d58: am 823f4502: am e918375b: Merge "Fix ColorMatrix intrinsic." into klp-dev * commit '37580d58f2c132d0437a0b5c87e9ffb9a5bc7db2':