summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-05-13 15:22:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-13 15:22:30 -0700
commit62734c9b311b55df8bd50575712ed4e320b7f7a5 (patch)
tree7c3a0d82b39adcb5d87692084cd4df7dc4a73876 /opengl/tests/gl_basic/gl_basic.cpp
parent4e57f41bb39cac185edfb4e024335edc695c1bb1 (diff)
parent89178d4de2964538c8a754df94c0911abe53c171 (diff)
am 2e4a3236: (-s ours) am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
* commit '2e4a3236a7634d17f89288e9739a438ecbea0471': DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions