summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2011-11-08 08:53:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-08 08:53:03 +0000
commit3468f92fd6875519d6a2c4bee8226c90fc26d771 (patch)
tree6191b555f84848c224a8aaca7664edba7eb10ded /opengl/tests/gl_basic/gl_basic.cpp
parent4bb742638cfcdb1762973efe7c89c2282f3f813f (diff)
parent2240d7d0c4783cd57a4a425276411170a12160b3 (diff)
am 39896f52: Merge "No more context menu in TextView" into ics-mr1
* commit '39896f52a84947ffc2062a2584033ff749d90534': No more context menu in TextView
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions