diff options
| author | Andreas Huber <andih@google.com> | 2010-09-28 13:59:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 13:59:26 -0700 |
| commit | c2f24a2dfa6d8e50f57bd57142da94d3b257c784 (patch) | |
| tree | ec0d57c0a2b7a27296af698924aaad4992ab07a6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | db9c0ac2d948a8e8e98f233ad109cd7fc35eab6c (diff) | |
| parent | 20144fef23ee98f952ff4b96dc50b18e3378b230 (diff) | |
am 9d591860: am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbread
Merge commit '9d59186068891834272c2e3ee6f9c4228af24656'
* commit '9d59186068891834272c2e3ee6f9c4228af24656':
Squashed commit of the following:
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions