am 1001a2eb: am 7c7bc46e: am d81ee05f: am 242e7188: am 335d8fd9: am 0ff36b1a: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac

* commit '1001a2eba9c2ab6815e15708cdbbb5878b2d104b':