tree 3d7f7dab577a3377feb3ccfda8950bd1264a3a99
parent 64014612275d0fccd5e31f2afaa8f17a6bf1e93d
parent bf3c634dc5bea1d6188efaba159b1ecbc038a4f7
author Fred Quintana <fredq@google.com> 1314923725 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314923725 -0700

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