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

Change-Id: Ic955cc1965e86c6863065694b0bb258544d460d8


Trivial merge