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

Change-Id: I1328497673c38aefc8617ee7c555ae2b242edb53


Trivial merge