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

Change-Id: I754c4572f6adb856d384ed18fd12a1998ef22b8c


Trivial merge