tree 8bb3fca13c3923d2943527b94aed148c49f70448
parent e090519020183d8bf7a627e4ef209d82bb22101e
parent 59db42d8d784428dcd442d2180f559cb502dee05
author yufei <yufei121@huawei.com> 1532717664 -0700
committer android-build-merger <android-build-merger@google.com> 1532717664 -0700

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

Change-Id: I6f54cb995b302d0df06a07b09c85b5d153947ca6