Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 18:12:59 +0000 (18:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 18:12:59 +0000 (18:12 +0000)
commitd364cc3c11cda5092022b98337b7f21643936d3d
tree42f46eb7c4d33adfad9baf71c3975d9ac723716c
parent155c97d105f07b6f5343d10b161a0bac3624e621
parent6ec69a101d62169d618569162ba7945c95b76a45
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: 705f37810e
am: 6ec69a101d

Change-Id: Ie861a8e32fc6a63c6663c387c999acbeda864985