Merge "Merge "Relax line width verification in primitive bbox tests" into nougat...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:03:25 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:03:25 +0000 (20:03 +0000)
am: 178fdad625

Change-Id: Id93307c696c142e2be99248dadc5ac6f93526733


Trivial merge