Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat...
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 24 Aug 2017 17:48:21 +0000 (17:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:48:21 +0000 (17:48 +0000)
am: 932a74d3d2

Change-Id: Id8c9685fc69e5a089ee8189b34daed33544f800a


Trivial merge