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

Change-Id: I8b7fab12228e9366c9f96280288a88867bbd4724


Trivial merge