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

Change-Id: I4e0bf57c975ab1280648e3e342f1c1938f8d4c60


Trivial merge