resolve merge conflicts of d097869 to nyc-dev
authorPyry Haulos <phaulos@google.com>
Thu, 24 Mar 2016 21:27:31 +0000 (14:27 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 24 Mar 2016 21:27:31 +0000 (14:27 -0700)
commit3ed20144b972971fb6e62a470d65031028b3fc27
tree3161094ecd22d7dcefae640e5f4983e660e516cc
parent78bda03a6167c6697598f3f4497b4f0afb687c0c
parentd097869eacaa9c4e3881f75e4b407af62c4db074
resolve merge conflicts of d097869 to nyc-dev

Change-Id: Id5780291dfd79a8256a0d979ce1e6d13a90293e9
modules/gles2/functional/es2fClippingTests.cpp