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

Change-Id: I11192dcb244d80cfcb7cda06673ba747f11b42bb


Trivial merge