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

Change-Id: I38ebf494e5b067abe94d3d7f510d7956c0bbb6c3


Trivial merge