commit | 1aae6c37a7cbf2c5c650724dbdcae0a7569de261 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:51:47 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:51:47 2015 +0000 |
tree | 0fe003ba0d24a69430cffa048f11766abc81bc61 | |
parent | a531b24c79060d067d0a7f5834288098c5364861 [diff] | |
parent | e2c58c5eb0886484c2c31b320e19ff7487ae876f [diff] |
am e2c58c5e: am 6bc3d631: am 25575111: 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 'e2c58c5eb0886484c2c31b320e19ff7487ae876f':