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

Change-Id: I2700b9cbc985a22837cac5535d09379035a4b3c5


Trivial merge