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

Change-Id: Ie861a8e32fc6a63c6663c387c999acbeda864985


Trivial merge