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

Change-Id: I4e1060cc6c204387f1520a40b97fa061a9044241


Trivial merge