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

Change-Id: I1d2a295e6d58c3a92b40c2ff6d6ac7886ba47225


Trivial merge