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

Change-Id: I71c3ad547ecb67bea2722ddabe305993c6073b52


Trivial merge