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

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

Change-Id: I900430dad177b690ea13d018467126c396de41e0