Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:24:14 +0000 (16:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:24:14 +0000 (16:24 +0000)
commitb696017f7fbc0f09e7a3ac86e109eb2bd1aa0de9
tree42f46eb7c4d33adfad9baf71c3975d9ac723716c
parent3f554187f8d19be8a2dacffd0f5483442e1efa75
parent7697d09e8e13d406a8800b657cafeb65a5115db6
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
am: 7697d09e8e

Change-Id: I4add135bb10be4157a679330945c861140542774