Merge "Merge "Relax line width verification in primitive bbox tests am: ba45591407...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 19:45:04 +0000 (19:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:45:04 +0000 (19:45 +0000)
am: ee4c986c2d

Change-Id: I6b4bbfc8d73e0bdcaf892641f101286036b528c3


Trivial merge