diff options
author | Roman Nurik <romannurik@google.com> | 2009-12-10 17:07:00 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-10 17:07:00 -0800 |
commit | ca82b3899d098c61f713d52be73170a3a36b28e6 (patch) | |
tree | be9101c1aa3c74534fb3c6d42b6dca180c58615f /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 74aba3d9db0c64ea2aa292a46a390c9db6bb3aa6 (diff) | |
parent | f414887b3c7af00a66c7f8b105dfd9fd2cb3ec2f (diff) |
am 7eb6ec1f: Merge change I18305fec into eclair
Merge commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1' into eclair-plus-aosp
* 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