am d6fe02d0: am 7722504f: Merge "Add tests for GL_EXT_debug_marker" into mnc-dev
authorPyry Haulos <phaulos@google.com>
Thu, 28 May 2015 17:46:29 +0000 (17:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 May 2015 17:46:29 +0000 (17:46 +0000)
commit6539366946a87ee128e109dbea0b7b00178544f7
tree961e8b7bfcd01ebd20adc4885c77993077d76755
parent0abc57b34f972e73c86d113a216a68920fb4afec
parentd6fe02d058d314e02593a72af17118d58e158f2a
am d6fe02d0: am 7722504f: Merge "Add tests for GL_EXT_debug_marker" into mnc-dev

* commit 'd6fe02d058d314e02593a72af17118d58e158f2a':
  Add tests for GL_EXT_debug_marker
framework/platform/null/tcuNullRenderContextFuncs.inl