diff options
| author | Fred Quintana <fredq@google.com> | 2010-04-28 14:13:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-28 14:13:55 -0700 |
| commit | e47930cd65b9227808812bfe25a2c69eb1694618 (patch) | |
| tree | 532df9facad6571445d85a65fb59ba0580ea5050 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 240d6d2042fcb6dbf04a115be6fed0a8c894a892 (diff) | |
| parent | 23894ce086b830ce26c74b8bdb10ba59f7f7b55a (diff) | |
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 '9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp
* commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814':
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