resolve merge conflicts of d097869 to nyc-dev
authorPyry Haulos <phaulos@google.com>
Thu, 24 Mar 2016 22:44:10 +0000 (22:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Mar 2016 22:44:10 +0000 (22:44 +0000)
am: 3ed2014

* commit '3ed20144b972971fb6e62a470d65031028b3fc27':
  Use smaller triangles in triangle_vertex.clip_three


Trivial merge