am 46588ef2: am 66360af8: Merge change 23266 into eclair

Merge commit '46588ef200aec0f6dbc7c07b132d002039fbd45e'

* commit '46588ef200aec0f6dbc7c07b132d002039fbd45e':
  disable canceling until the http connection code is understood

core/java/android/content/AbstractThreadedSyncAdapter.java

@@ -111,7 +111,8 @@ public abstract class AbstractThreadedSyncAdapter {
                 if (mSyncThread != null
                         && mSyncThread.mSyncContext.getISyncContext().asBinder()
                         == syncContext.asBinder()) {
-                    mSyncThread.interrupt();
+                    // TODO: figure out why canceling causes a hang
+//                    mSyncThread.interrupt();
                 }
             }
         }