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

Change-Id: Idf4f6941e51b2cc8c54a378550e4da9df49a52dc


Trivial merge