tree c7627ca75fa595afca24753ad2f33101574ee624
parent 6515f50d0c759cfff163aaf7f42a970019d93923
parent 87b146625a2daa7eaa606e1975e94a9a579af8b8
author Fred Quintana <fredq@google.com> 1315855074 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1315855074 -0700

Merge "Revert "Make the SyncManager timeout syncs if it takes too long to bind to them.""