am 7722504f: Merge "Add tests for GL_EXT_debug_marker" into mnc-dev
authorPyry Haulos <phaulos@google.com>
Thu, 28 May 2015 17:30:50 +0000 (17:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 May 2015 17:30:50 +0000 (17:30 +0000)
* commit '7722504f5a43bed8bde97954a5eeb2b4480891a1':
  Add tests for GL_EXT_debug_marker


Trivial merge