Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:18:55 +0000 (16:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:18:55 +0000 (16:18 +0000)
commit27ac88fa738657143e41238cb5f2d230f12f08fc
tree92b73d172be174efd608f88962a5080ea7898749
parent7399cb4e48ea40c0683f626e15f7176e069a555d
parent579c101261aae9410ad1d008ba32e370f8a82272
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

Change-Id: Idf4f6941e51b2cc8c54a378550e4da9df49a52dc