Commit 2e65618d authored by Keun young Park's avatar Keun young Park Committed by Android Git Automerger
Browse files

am a987f68b: Merge "nuke... 

am a987f68b: Merge "nuke android.opengl.cts.AttachShaderTest#test_glAttachedShaders_attach_same_shader" into jb-mr1-dev

* commit 'a987f68b':
  nuke android.opengl.cts.AttachShaderTest#test_glAttachedShaders_attach_same_shader
parents dfbaba08 a987f68b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment