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

Change-Id: I187d2d189d102d193717bf43ca4398cd6e8e975b


Trivial merge