Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:24:51 +0000 (16:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:24:51 +0000 (16:24 +0000)
am: a8ec7e0231

Change-Id: I75a34225e93f2bd903e9d1f219b2ea7e93f6e569


Trivial merge