Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 20 Jan 2017 20:40:05 +0000 (20:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2017 20:40:05 +0000 (20:40 +0000)

Trivial merge