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

Change-Id: I81f005b1da8dabe780d5f16e2b0b24f587286546


Trivial merge