Merge "Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd...
authorPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 20:44:12 +0000 (20:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:44:12 +0000 (20:44 +0000)
am: 0265d22b8c

Change-Id: I15227e9016dc8ec8e91c33716ce8df345af780fd


Trivial merge