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

Change-Id: Ia176d53657edd6e377c3882124ab3dfebf9a062b


Trivial merge