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

Change-Id: I6ef6f3ec353223115308e3a8d55a6ca6b5079164


Trivial merge