Merge "Merge "Generate flat triangles in polygon offset tests. am: 975a59ebca am...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 20 Jan 2017 20:45:34 +0000 (20:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2017 20:45:35 +0000 (20:45 +0000)

Trivial merge