tree b3caaa4b42530baea3682cb5e583fe0293ed27b3
parent 48e0c9ab5a937d603730107bbd1b6c49e199e207
parent 4a7c29dddf8582156f0884da5e59ef0f9697e630
author yufei <yufei121@huawei.com> 1532720678 -0700
committer android-build-merger <android-build-merger@google.com> 1532720678 -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
am: 4a7c29dddf

Change-Id: I5611502d73b6effb89a5d0d33eea83e9e3db2331