diff options
| author | Dan Morrill <morrildl@google.com> | 2010-04-05 14:59:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-05 14:59:47 -0700 |
| commit | 316aaaf56479ea6780139ef01b4748c9b1a983f4 (patch) | |
| tree | cdbf9768a271b0e0c930e042bbf7359082ffb896 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 72bb32ad7df1e9123acbfb499879b27e15d327db (diff) | |
| parent | 536267981d925264f3e55ea44d5509ef5934cf93 (diff) | |
am 21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
Merge commit '21390f08138801f9e008917c0c0149839a80d002' into froyo-plus-aosp
* commit '21390f08138801f9e008917c0c0149839a80d002':
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