am 7aad11b3: (-s ours) am eee8271e: DO NOT MERGE Split GLES31 copy image tests in 3.
authorKalle Raita <kraita@google.com>
Thu, 15 Oct 2015 17:20:31 +0000 (17:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 15 Oct 2015 17:20:31 +0000 (17:20 +0000)
* commit '7aad11b331b77930088d20c6748a6bf22f6ab506':
  DO NOT MERGE Split GLES31 copy image tests in 3.


Trivial merge