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

Change-Id: I0a4f828f7c2afd3b0136dcdda78b11704254208c


Trivial merge