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

Change-Id: Icc96166d287cf874820f734375a4f60a4620ff43


Trivial merge