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

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

Change-Id: I23fadf595d2733a9898baedd17e8e6fe9679fa63