resolve merge conflicts of cfeb3c0 to nyc-dev
authorDaniel Xie <dxie@google.com>
Fri, 6 May 2016 19:12:59 +0000 (19:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 May 2016 19:12:59 +0000 (19:12 +0000)
commit5e80b7e46307c206f4df887202119da61c096ecd
tree0499a82b4b6536377735d7314e0ba60b262229a4
parente6fd94251859763da8f1746891f096ed534c3a85
parent518f4892140466feacb6c7c772357c76a86c3a27
resolve merge conflicts of cfeb3c0 to nyc-dev
am: 518f489214

* commit '518f4892140466feacb6c7c772357c76a86c3a27':
  Remove GLES2-texture.wrap tests from mustpass

Change-Id: Ie2f928384f03ae0354405124263ce4e8e819f0db