diff options
| author | Christopher Tate <ctate@google.com> | 2010-08-24 18:27:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 18:27:01 -0700 |
| commit | 938f7fdcb8845cbbd79d499c1aa30c1c57630039 (patch) | |
| tree | 3d7a6ea3e640e88684325b18b52731badb53d295 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 051183aeab504e07bad824ec06bb4fbbdddd96f3 (diff) | |
| parent | 71d9781fc680b86830a6d2788e16dbfcfc81ce6d (diff) | |
am 384759b1: am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
Merge commit '384759b1c5e39d0f99fa551a369ae73197ab26c5'
* commit '384759b1c5e39d0f99fa551a369ae73197ab26c5':
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