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

Change-Id: I99c2f0d295b7cbde55512951168eb60e4871b4f8


Trivial merge