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

Change-Id: I8436c1b5cbdc9eb0777f4a3514c9504ba55e1650


Trivial merge