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

Change-Id: Ie6880a1e23650f5e7f95a20fe358115424fa8801


Trivial merge