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

Change-Id: I77114e3d87d94c063833c6badd3233428c7cd87c


Trivial merge