Merge "Revert "Use smaller triangles in triangle_vertex.clip_three"" into marshmallow...
authorDaniel Xie <dxie@google.com>
Mon, 18 Apr 2016 23:20:00 +0000 (23:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Apr 2016 23:20:00 +0000 (23:20 +0000)
commitf747a6ed486797b6d9657abce567f9bad6d8700b
treecff2d8400ad2beea2ec85858a64780b079eb31db
parent8c81aeee55dfa29ef1356abf55a8560edf20fa8d
parentc85241cfacb84b24dc5c0374f67fa7097228ccc5
Merge "Revert "Use smaller triangles in triangle_vertex.clip_three"" into marshmallow-cts-dev am: 8b38db9 am: e7bc14a am: afa9f90 am: 543f748
am: c85241c  -s ours

* commit 'c85241cfacb84b24dc5c0374f67fa7097228ccc5':
  Revert "Use smaller triangles in triangle_vertex.clip_three"

Change-Id: I7686f54384fa3557a112c343a645d5dea328ccd9