Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 3 May 2017 16:14:10 +0000 (16:14 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 3 May 2017 16:14:11 +0000 (16:14 +0000)

Trivial merge