am 65393669: am d6fe02d0: am 7722504f: Merge "Add tests for GL_EXT_debug_marker"...
authorPyry Haulos <phaulos@google.com>
Thu, 28 May 2015 18:03:28 +0000 (18:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 May 2015 18:03:28 +0000 (18:03 +0000)
commitafa1e96e1173589f4456dbccdfc7ba8ed28c5abc
treef8d74e29a3dd777f88fcca604a9d6b59a0c1a3f9
parent8926ce7d33ff20750d67e988d3d40a63b21f969b
parent6539366946a87ee128e109dbea0b7b00178544f7
am 65393669: am d6fe02d0: am 7722504f: Merge "Add tests for GL_EXT_debug_marker" into mnc-dev

* commit '6539366946a87ee128e109dbea0b7b00178544f7':
  Add tests for GL_EXT_debug_marker