Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:18:53 +0000 (16:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:18:53 +0000 (16:18 +0000)
commit7697d09e8e13d406a8800b657cafeb65a5115db6
tree26a81b3d13bdfd830129f0e252f22c8cc7827765
parentd2425448d588c4a1d811e5f66fd3e4618a1a6d24
parent0bcd8aabc414f1a3a25d8863db092927e56149ce
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: c2594c65ff am: 1203cd8416 am: 365f13849d" into nyc-mr2-dev-plus-aosp
am: 0bcd8aabc4

Change-Id: Ia176d53657edd6e377c3882124ab3dfebf9a062b