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)
* commit 'd6fe02d058d314e02593a72af17118d58e158f2a':
  Add tests for GL_EXT_debug_marker

1  2 
framework/platform/null/tcuNullRenderContextFuncs.inl