diff options
| author | Fred Quintana <fredq@google.com> | 2010-04-28 14:18:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-28 14:18:19 -0700 |
| commit | 93d41f38bbf91916bc4f891107bce6be9f4f419e (patch) | |
| tree | d2c373cf5af743810228834e5755d0a33aac81cf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 93120c58c4788962be70875fca8c8ca9774535c5 (diff) | |
| parent | e47930cd65b9227808812bfe25a2c69eb1694618 (diff) | |
am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
Merge commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071' into kraken
* commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071':
revert a change in the SyncManager that caused it to not cancel
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions