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

Change-Id: Idced4ef250b2fc485931b8d5358dd5ce6ee16e51


Trivial merge