diff options
author | Roman Nurik <romannurik@google.com> | 2009-12-10 19:48:47 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-10 19:48:47 -0800 |
commit | ce704768e1172245a29ee241cbcc7e6c4c9a38c3 (patch) | |
tree | 8dd322bffef48a0cad5a7965b7b14d30af521afc /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 3fb6f499f828efd1f696912202c726a2c6f04c42 (diff) | |
parent | f414887b3c7af00a66c7f8b105dfd9fd2cb3ec2f (diff) |
am 7eb6ec1f: Merge change I18305fec into eclair
Merge commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1' into eclair-mr2
* commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1':
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