Merge "Revert "Use smaller triangles in triangle_vertex.clip_three"" into marshmallow...
authorDaniel Xie <dxie@google.com>
Mon, 18 Apr 2016 23:27:08 +0000 (23:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Apr 2016 23:27:08 +0000 (23:27 +0000)
am: a2659ec

* commit 'a2659ec390fdd129b3bdb4a21c45eb395063c114':

Change-Id: Icbb07e8e25aa7122b9d72af6cfad4bfe35fdf65c


Trivial merge