diff options
| author | Dan Morrill <morrildl@google.com> | 2010-04-05 15:03:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-05 15:03:48 -0700 |
| commit | f21a22f3f585652245f55a8a7a31dd476619c493 (patch) | |
| tree | ba02998adcfbe8e2fb1483d418f63704657336f5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | fe83ccca89c9c325438ba66419fe51f77f37f06e (diff) | |
| parent | 316aaaf56479ea6780139ef01b4748c9b1a983f4 (diff) | |
am ca5e7de8: am 21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
Merge commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e' into kraken
* commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e':
Adding a feature definition for touchscreens that was overlooked in the last
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions