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

Change-Id: I29e45817dd40064cb7e14e1556c0ca7f579d543d


Trivial merge