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

Change-Id: I931c0c06849dcec2f66f8ed0b78d28fd9c0af834


Trivial merge