am b72263a1: am 3ec40c89: Merge "Force sampling to single texture level in copy image...
authorMika Isojärvi <misojarvi@google.com>
Thu, 11 Jun 2015 02:00:25 +0000 (02:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jun 2015 02:00:25 +0000 (02:00 +0000)
commite457d520efc4e20a50c3f1b7490c7da1966de5b4
tree981987cb7c620af1bee84afe35e2657f5620c771
parentea4c0316fcc0da49e689ed5a59a8b90fc14fd3fd
parentb72263a1e501c2e21c47c7c49055abf74cf898ee
am b72263a1: am 3ec40c89: Merge "Force sampling to single texture level in copy image tests" into mnc-dev

* commit 'b72263a1e501c2e21c47c7c49055abf74cf898ee':
  Force sampling to single texture level in copy image tests
modules/gles31/functional/es31fCopyImageTests.cpp