Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:50:57 +0000 (17:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:50:57 +0000 (17:50 +0000)
commit486666b68871f1b734d1b71eb07ec7b946b068ee
treeaad755add28ec91c80292ca2400259fdc25363f0
parent92af0d51778d2271368f806b68f006bb811fc3fe
parentaf56714a9bccf92c091020707bd64ee59cbb43ff
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: 27ac88fa73
am: af56714a9b

Change-Id: I4ea47415c8ae67810a215ad698b88ed410bcc4fd