diff options
| author | Adam Powell <adamp@google.com> | 2010-09-17 15:46:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-17 15:46:07 -0700 |
| commit | a6e7b5f538f604c3d6a37862e42ee3b96c88372f (patch) | |
| tree | 36d508e852b42056cd4e0a6d023d518228313e7c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b89a986dd9c6d3f7a15715ab1d6a7ca1f6a2132a (diff) | |
| parent | 8d978cdd291893a9fc57cf05015c9ec1bc6dc244 (diff) | |
am 25945ca2: Merge "Fix silly touch bug in TextView. Oops." into gingerbread
Merge commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266' into gingerbread-plus-aosp
* commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266':
Fix silly touch bug in TextView. Oops.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions