diff options
| author | Joe Onorato <joeo@android.com> | 2010-08-31 13:25:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 13:25:27 -0700 |
| commit | 38d4fb7b15305798d715323aec625aa7de29953e (patch) | |
| tree | 9feeafe4715ba3fd56518327734041217c1c5415 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cb2e65091835b26a9d5efce3ef84af3a708f3727 (diff) | |
| parent | 28afafdfd310bb056c53f85292a8029ded0aeb3c (diff) | |
am 54901c9e: fix the build. will revisit this change in a minute
Merge commit '54901c9e8497b33bab1462245864e9dd119bb64c' into gingerbread-plus-aosp
* commit '54901c9e8497b33bab1462245864e9dd119bb64c':
fix the build. will revisit this change in a minute
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions