Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:...
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:52:13 +0000 (17:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:52:13 +0000 (17:52 +0000)
am: a5f4638914

Change-Id: I0a2e638b81da02b7b58fc84eccd967da6c2edfcb


Trivial merge