summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorKonstantin Lopyrev <klopyrev@google.com>2010-08-06 19:06:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-06 19:06:44 -0700
commit83a638af1e64e46de96d0d10b16bd7efbb0cf3a3 (patch)
treee322e5740941cb092c1291b54ec648b4e1785eb3 /opengl/tests/gl_basic/gl_basic.cpp
parent9e2b418b1a5512401f3a8cb2e155b828a8563cf2 (diff)
parent4f76b3aece5b9df1b35d0581b9704b12795bbb3b (diff)
am 443f9baf: am 3b0d3d51: Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread
Merge commit '443f9bafb02c6a5a7311c7069995e5a3bdd875f8' * commit '443f9bafb02c6a5a7311c7069995e5a3bdd875f8': Adding a way for Hierarchy Viewer to get the focused window.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions