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

Change-Id: Ibb1a95b31eb5383d1bb5743c6db298953e47b503


Trivial merge