Merge "Merge "Merge "Generate flat triangles in polygon offset tests." into nougat...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:16:41 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:16:41 +0000 (20:16 +0000)
am: 8e8c90ec5a

Change-Id: Ie71e61bac4bc13779fed78645c7aa391f6080d6b


Trivial merge