Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:15:12 +0000 (20:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:15:12 +0000 (20:15 +0000)
am: 34f90f1d46

Change-Id: I2fdaadd983cf92f9aa607a4351f343cbdd765d58


Trivial merge