Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 3 May 2017 16:11:18 +0000 (16:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 3 May 2017 16:11:18 +0000 (16:11 +0000)

Trivial merge