diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-25 10:18:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 10:18:14 -0700 |
| commit | 19e9ecc8a292d4c2f7b4ba03a685452500e392e3 (patch) | |
| tree | 0314b93c0f69ae613944b5e5ca4df9908f1217ad /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | caaf16916828b4cd13549044a8ed57a219414616 (diff) | |
| parent | 1c07fd511df873d9c4b6dcd066529959f7809ff6 (diff) | |
am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant
Merge commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758' into gingerbread-plus-aosp
* commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758':
Make the default backup configuration "disabled; local transport selected"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions