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

Change-Id: I1a3b820753b889a66fa5101d7ddb7ec4b3d723af


Trivial merge