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

Change-Id: Idc2a767f42d571de025ed99538f769e50a6e089d


Trivial merge