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

Change-Id: If38159d29357c10a4fcae002dee923433cf48ff6


Trivial merge