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

Change-Id: Ide25b381041f3c545b53906842a2caa7733b7ddc


Trivial merge