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


Trivial merge