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

Change-Id: I0539b2cf51815eef95eba86e72557813e9bd1937


Trivial merge