Merge "Add tests for GL_EXT_debug_marker" into mnc-dev
authorPyry Haulos <phaulos@google.com>
Thu, 28 May 2015 16:22:21 +0000 (16:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 28 May 2015 16:22:22 +0000 (16:22 +0000)

Trivial merge