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

Change-Id: Ib16cfe7f0642abf81fb43e6c416433669c5e485c


Trivial merge