Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:25:09 +0000 (16:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:25:09 +0000 (16:25 +0000)
commit41364eba882c080e2e66820d068e6aa0c2e37ce6
tree42f46eb7c4d33adfad9baf71c3975d9ac723716c
parent9b90f47dcc6085f8f255a54d457eb2e12370c1bb
parentaf56714a9bccf92c091020707bd64ee59cbb43ff
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
am: af56714a9b

Change-Id: I2700b9cbc985a22837cac5535d09379035a4b3c5