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

Change-Id: If535925b571294338b6edcf80e388189967ba23e


Trivial merge