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)
commitd6fe02d058d314e02593a72af17118d58e158f2a
treee83bb8b05ac289f3883ec7a07ee3f50872cba12a
parent40c2eb9df94d33dd9ac454d450c4320dc7dcd52c
parent7722504f5a43bed8bde97954a5eeb2b4480891a1
am 7722504f: Merge "Add tests for GL_EXT_debug_marker" into mnc-dev

* commit '7722504f5a43bed8bde97954a5eeb2b4480891a1':
  Add tests for GL_EXT_debug_marker