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

Change-Id: Icbd6e2e82dd0dda0e28881154e1d0ba2ed24af7e


Trivial merge