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

Change-Id: I1b9bad43ad4096e05b62d6de5a158161bfde4f99


Trivial merge