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

Change-Id: I582c24e2b7108c392cccc457e84df1c67d7ee5ab


Trivial merge