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

Change-Id: Iabf1c0d76db9f83f64cae805f89bd60230cd0408


Trivial merge