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

Change-Id: I7cbc7fe4ea7caca2964bc57c5e8b21c7f6aa2be2


Trivial merge