Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:52:33 +0000 (17:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:52:33 +0000 (17:52 +0000)
commitf9a4931dbb4f170b45adfa41ceb0364080916a97
treeaad755add28ec91c80292ca2400259fdc25363f0
parenta1e9a4c6acb72baf8f6ba2de39d4ece9403dd3e1
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: I83d067e9625f74330d6ca52b8e876f2789ad4841