diff options
| author | Alon Albert <aalbert@google.com> | 2011-02-16 10:26:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-16 10:26:53 -0800 |
| commit | 47a95e69d16af7affed5676e67abb022137f7753 (patch) | |
| tree | 2de34eaf949bd30904e7e7343a64fce86fec4561 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 397de759163918c39ff800bed2f22e02d1d5ce77 (diff) | |
| parent | 92b31b9c0b3497620b2860457b2251a0e44a7d3b (diff) | |
am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
* commit 'b79db4cd5ccbe17e837c8943abb658bbf0dd0854':
DO NOT MERGE - Clear backoffs on reconnect
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
