summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-09 21:39:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-09 21:39:13 -0700
commitf1a54de9b162a5c6c1df5d574d4cea7f9599ea3f (patch)
tree89ff8514ad6e7ca57179caa363df5a98f06c17c0 /opengl/tests/gl_basic/gl_basic.cpp
parent8c494ed2501e92553c080222a9faf3f8dc0aa8d5 (diff)
parent4b9adfdb29ca35654e229825184046ee303fda94 (diff)
am 195dc210: am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread
Merge commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c' * commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c': Small fixes to battery stats.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions