Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 20:56:48 +0000 (20:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:56:48 +0000 (20:56 +0000)
am: c4617ac622

Change-Id: Ic17bb443ec60de537989f4770d3ef140a1810cb3


Trivial merge