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

Change-Id: I5147a55b71384271477d3612f6d99e608aadbfd5


Trivial merge