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

Change-Id: I7d5667a14e2a4bb85d5a19970d1d466750fcae1a


Trivial merge