Merge "Merge "Relax line width verification in primitive bbox tests" into nougat...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 20 Jan 2017 20:39:13 +0000 (20:39 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2017 20:39:13 +0000 (20:39 +0000)

Trivial merge