Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:21:39 +0000 (16:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:21:39 +0000 (16:21 +0000)
commitaf56714a9bccf92c091020707bd64ee59cbb43ff
tree26a81b3d13bdfd830129f0e252f22c8cc7827765
parenta8ec7e023164ceade1369f2a9b4d8c3639ce960c
parent27ac88fa738657143e41238cb5f2d230f12f08fc
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: c2594c65ff" into nyc-mr1-dev am: 2190aa2642 am: 7394ee84a1 am: 579c101261
am: 27ac88fa73

Change-Id: I1a3b820753b889a66fa5101d7ddb7ec4b3d723af