am e068a86d: am 2d453381: (-s ours) am 2d6fd94f: Remove rest of the gradient ditherin...
authorMika Isojärvi <misojarvi@google.com>
Thu, 27 Aug 2015 14:47:10 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:47:10 +0000 (14:47 +0000)
* commit 'e068a86d46784e99f0f21a2840850bfc7665ff1e':


Trivial merge