tree 9935d7f6213bf7efac54b4839d5ab4987fc84dc6
parent 623719e317820c16d2537a020dc624d1ec78711b
parent 24428b818f44db5a242b3858bb97a15becad2318
author Keun young Park <keunyoung@google.com> 1349901092 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349901093 -0700

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