am eee8271e: DO NOT MERGE Split GLES31 copy image tests in 3.
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:50:05 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:50:05 +0000 (19:50 +0000)
am: 7aad11b331  -s ours

* commit '7aad11b331b77930088d20c6748a6bf22f6ab506':


Trivial merge