Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:06:24 +0000 (20:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:06:24 +0000 (20:06 +0000)
am: 5d201524b3

Change-Id: Ib4e43da1c9acc82d58f5ba0ad89c2cb241046a05


Trivial merge