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

Change-Id: I73f7ec17d1feb01b22ac98484bd02f36f37dcf1e


Trivial merge