Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev...
authorAlexander Galazin <alexander.galazin@arm.com>
Wed, 3 May 2017 16:11:31 +0000 (16:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:11:31 +0000 (16:11 +0000)
am: e63231fb5e

Change-Id: Iebfca6923d5c6bd9daef134283c5492bc5a88852


Trivial merge