diff options
| author | Mathias Agopian <mathias@google.com> | 2010-08-11 17:35:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 17:35:58 -0700 |
| commit | ea6dbaf3029783fba305fe6323c504accc3c2fd7 (patch) | |
| tree | 0eea8c5963e03d35f60c1df623e818d40963952b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c39f50a82741a7037d2fb7580a8db6abc84990f9 (diff) | |
| parent | ce6d43a32afcd79e0b3a0dfa716fd0f3cb36b78b (diff) | |
am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread
Merge commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee' into gingerbread-plus-aosp
* commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee':
should fix sim build, hopefully
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions