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

Change-Id: Ibc91272a8ad15f813f273cf05bb6b6f846ae600f


Trivial merge