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

Change-Id: Ie6be7d6721cd5d04e0e89b8364e554e63f268031


Trivial merge