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

Change-Id: I0b6dace39931d8941f7bd012d636b73eff7097d6


Trivial merge