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

Change-Id: I83d067e9625f74330d6ca52b8e876f2789ad4841


Trivial merge