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

Change-Id: I6cf301acefeca41c22cc734587e8ff27225885f9


Trivial merge