DO NOT MERGE Split GLES31 copy image tests in 3. am: e3f31fbe9e -s ours am: 74e77f92...
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:54:45 +0000 (19:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:54:45 +0000 (19:54 +0000)
am: e8bc0e9db4  -s ours

* commit 'e8bc0e9db40b57da9554cfec0df727896ce72b78':


Trivial merge