am 3d302858: am 8e0148aa: (-s ours) am fcb31b81: Remove few blend tests from rgb565...
authorMika Isojärvi <misojarvi@google.com>
Thu, 27 Aug 2015 14:47:07 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:47:07 +0000 (14:47 +0000)
* commit '3d3028584dc81c52eda8be5367ecf8c3ab1e4f79':


Trivial merge