Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:13:46 +0000 (16:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:13:46 +0000 (16:13 +0000)
commit7394ee84a17c6b5a04ec782530a98adfa0d8248f
treebd444b7c5f2e2a4fe93a0657371a01f25ddf26d0
parentd4c8a3ac82b62c41d8c6d01622f68f4cdd32102e
parent2190aa2642a1e814865425aa10eaeaaf14e8c8cf
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: c2594c65ff" into nyc-mr1-dev
am: 2190aa2642

Change-Id: I0ca69aeb72966ca1760ddb1b52af5b0896200936