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

Change-Id: Id70658e778b7715e14310708b4b14cdf499a4ae8


Trivial merge