am b93b9361: (-s ours) am d055b32f: Remove white gradient test without dithering...
authorMika Isojärvi <misojarvi@google.com>
Thu, 27 Aug 2015 10:46:26 +0000 (10:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:46:26 +0000 (10:46 +0000)
* commit 'b93b93614c5ef68c4f5a2ce90475e519d621aefb':


Trivial merge