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

Change-Id: I05dc65cb0a4a85f34f8adf5f17ccb9abf7eab69e


Trivial merge