summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRoman Nurik <romannurik@google.com>2009-12-10 19:57:39 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-10 19:57:39 -0800
commit0c5e0eb152b3d43e0722ccb871468b56a4e1df75 (patch)
tree7c49acee1280d2f9931dff4a002f75ecfe33fb9a /opengl/tests/gl_basic/gl_basic.cpp
parentfc01eaf5dae0aea33e3c3c28f89f38b394c69124 (diff)
parentce704768e1172245a29ee241cbcc7e6c4c9a38c3 (diff)
am 05bbeb35: am 7eb6ec1f: Merge change I18305fec into eclair
Merge commit '05bbeb356286bfb6ddc26ac546cce03334e346dd' into eclair-mr2-plus-aosp * commit '05bbeb356286bfb6ddc26ac546cce03334e346dd': Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions