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

Change-Id: I710c20679327116888d493649b6a24183c2d705b


Trivial merge