Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 20:56:48 +0000 (20:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:56:48 +0000 (20:56 +0000)
commit5d201524b3de956a7ad5c9dda9f95c33162f1594
tree3562490f32f31ee5aa01414399d9be8379dfd570
parent2f6cf734f87381f03eb227b95a8b643e972976fd
parentc4617ac6222ea0c9ab29b2980d60b7da31d3c2fa
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 5611bf398b am: e2d1c25650 am: d368eb8664 am: 8cfa8cb220 am: 987939f284" into nyc-mr2-dev-plus-aosp
am: c4617ac622

Change-Id: Ic17bb443ec60de537989f4770d3ef140a1810cb3