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

Change-Id: Iccd5843c054815525a8824b878f6b19bbf6a38f6


Trivial merge