tree 58964122497f7f982a2867add89620985031bc4e
parent a88a74a4f1856bc3e161e9a628d013ad5cabaa74
parent 2e7a17f7e463639bf96424708b1eb32c35eab2d9
author yufei <yufei121@huawei.com> 1532718574 -0700
committer android-build-merger <android-build-merger@google.com> 1532718574 -0700

Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: increase Maximum allowable number of consecutive failed pixels" into nougat-cts-dev am: 59db42d8d7  -s ours" into nougat-mr1-cts-dev am: c7b7bb4050  -s ours" into oreo-cts-dev
am: 2e7a17f7e4  -s ours

Change-Id: I3121646ac4616ce57d8f44171324001cba6dfd91