Commit a987f68b authored by Keun young Park's avatar Keun young Park Committed by Android (Google) Code Review
Browse files

Merge "nuke... 

Merge "nuke android.opengl.cts.AttachShaderTest#test_glAttachedShaders_attach_same_shader" into jb-mr1-dev
parents 623719e3 24428b81
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