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

Change-Id: I8eda5991f3fc92e64bdcea31f4f4bfed1c2929b4


Trivial merge