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

Change-Id: I707f8523b65c4e6d18f3c30c848359dbefc140c5


Trivial merge