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

Change-Id: I399a62cbf4ad5b60320e8ae952a8239dba03d0bf


Trivial merge