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

Change-Id: I90553fb1eb9b1c403dbb20a46702d8b44b941dde


Trivial merge