Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 19:41:01 +0000 (19:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:41:01 +0000 (19:41 +0000)
am: 53b0618ee8

Change-Id: I60a2bdc94bc50b3f701295de1b03a4d47df52f28


Trivial merge