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

Change-Id: Ib868428a1a4a20687d19531e5381074c353373cd


Trivial merge