tree 3fae7e490de0cbd1f08d34ab96b64be57e611cb3
parent f70ce3e211e4ff6f1a69179e8035f002b4480bab
parent d460a35588826a84ceb8ca6b06b42c038baac9a4
author Daniel Xie <dxie@google.com> 1441404123 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441404123 +0000

am d460a355: am 52948ac4: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev

* commit 'd460a35588826a84ceb8ca6b06b42c038baac9a4':
  DEV HACK: cts: increase permitted colour delta