Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:...
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:50:42 +0000 (17:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:50:42 +0000 (17:50 +0000)
am: a8ec7e0231

Change-Id: Ia5a40ac839b7ecd118d573af6ebf46079b08f5e2


Trivial merge