am e1bf39bc: am cb40ba28: am 89c76843: Merge change I9b771df3 into eclair

Merge commit 'e1bf39bc764c78344dd2a6c59c5709919bdc1da9'

* commit 'e1bf39bc764c78344dd2a6c59c5709919bdc1da9':
  Make sure AsyncTask sens a null result to onPostExecute() when cancelled.

core/java/android/os/AsyncTask.java

@@ -413,6 +413,7 @@ public abstract class AsyncTask<Params, Progress, Result> {
     }
 
     private void finish(Result result) {
+        if (isCancelled()) result = null;
         onPostExecute(result);
         mStatus = Status.FINISHED;
     }