summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-05-16 11:09:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-16 11:09:31 -0700
commit30c47d2f95ff862bf065aa881c6dfd374745592a (patch)
tree384bd709bfdad1b99e928efef531b47d16a3d8f3 /opengl/tests/gl_basic/gl_basic.cpp
parent26d5761d2342fc232fd51104d649439b69f67db0 (diff)
parent77c7b95e11bfdffb4f80f9b373a3d22edfe358ba (diff)
am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
* commit '2a20583a5f436d66ab73cd6c0fdc73e59a3cecad': DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions