tree cfba2cd36121442547d52ccb65fffd7ec2420b78
parent 86a6e42ab72ea4ed9ca7bce6d8d49572cadcc088
parent c7b7bb40502f2784588a2f8624d98b6ab7df3d3e
author yufei <yufei121@huawei.com> 1532718636 -0700
committer android-build-merger <android-build-merger@google.com> 1532718636 -0700

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

Change-Id: Idd61c2d6f542c79dca4d90590b68aecce731c2e3