Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:16:19 +0000 (16:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:16:19 +0000 (16:16 +0000)
commit579c101261aae9410ad1d008ba32e370f8a82272
treebd444b7c5f2e2a4fe93a0657371a01f25ddf26d0
parent862196b30a5e1d36e614b33222b1118fe0841829
parent7394ee84a17c6b5a04ec782530a98adfa0d8248f
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

Change-Id: I3c7400d5f5b25062d72b00a1fba0719f6bdad171