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

Change-Id: I6d9f11eab0cddb3abe8beb8af5cacfc3f538a23a


Trivial merge