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

Change-Id: Iba7f7005d3fe89e5a927cf5afe07a13a3312a525


Trivial merge