resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214
authorMika Isojärvi <misojarvi@google.com>
Fri, 6 May 2016 19:17:38 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 May 2016 19:17:38 +0000 (19:17 +0000)
commit1b8fe1f99900105f97dca9d1534d96214bde57a8
tree0499a82b4b6536377735d7314e0ba60b262229a4
parent3669b3b227edc79336761b3ce6d668d99c1e7eef
parenta6eacd810172a6b01938470ba105121ca742761b
resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214
am: a6eacd8101

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

Change-Id: I1622b91e38e1f480ee298385d2a187cff8a8e96a