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

Change-Id: I019c733753bc99b9c2b82f8c21c5bd8b049220c7


Trivial merge