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

Merge commit 'cb40ba2802f2f6e88a1ab9d583284d8afbec68a1' into eclair-mr2-plus-aosp

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