am 34b6a27e: Merge change 23375 into eclair

Merge commit '34b6a27ea38adeea54a488efc6bbd04c58cb8a91' into eclair-plus-aosp

* commit '34b6a27ea38adeea54a488efc6bbd04c58cb8a91':
  re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()

core/java/android/content/AbstractThreadedSyncAdapter.java

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