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

Change-Id: I9bfa731b074538d354a25945f760ba00d9c31ad1


Trivial merge