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

Change-Id: Ifade543e4262d872142c9d3fa7dd54b23f382a8c


Trivial merge