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

Change-Id: I639413972a8f2c7ef6561c3f39bf13d7a7e07f04


Trivial merge