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

Change-Id: Ic7b839e2663709f543e34d129d7efedf4d107f39


Trivial merge