commit | 2557511129bd97ee873eaad27cdc05b28b7c161f | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:20:48 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:20:48 2015 +0000 |
tree | 98509ed57ed5de37df6e0e64ba266e75c156c743 | |
parent | 4761213296ef47e7a0028e1aef14c42cccfb0011 [diff] | |
parent | 1001a2eba9c2ab6815e15708cdbbb5878b2d104b [diff] |
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':