summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-10-07 17:21:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-07 17:21:40 -0700
commitf5c77459fa992998345c93c2777c4390b9edc122 (patch)
tree4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f /opengl/tests/gl_basic/gl_basic.cpp
parent98a880a34cfa77efa30d3b86e0c24f1c48d27a9b (diff)
parent313b09d0afdbbc01d4a67aaba9f172704ad7db15 (diff)
am 3ecceb5b: Merge "TextView refactoring to ease future merges in HC." into gingerbread
Merge commit '3ecceb5b94233320ed88825759d6118fed7add2c' into gingerbread-plus-aosp * commit '3ecceb5b94233320ed88825759d6118fed7add2c': TextView refactoring to ease future merges in HC.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions