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

Change-Id: I8291da4b9d2958acc6fdd74dacd8201d9f1607e0


Trivial merge