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

Change-Id: I409a88ace31615016f5794ceb2992a1c07dd800c


Trivial merge