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

* commit '9bc2f18d3e6d3bf13a1564735fa395dc5254bf0a':


Trivial merge