Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:42:31 +0000 (18:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:42:31 +0000 (18:42 +0000)
am: 3b0479c233

Change-Id: I71d4fc5fc3e81382b5d2e0a09bb49762b1c0478f


Trivial merge