am 89c76843: Merge change I9b771df3 into eclair

Merge commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd' into eclair-mr2

* commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd':
  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;
     }