commit 7ebdcbdb6f3314ffa3f3817ed62251b8973179fa
author Tom Taylor <tomtaylor@google.com> Tue Dec 29 20:11:00 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 29 20:11:00 2009 -0800
tree 44d7ac9ca4620f1db10c0cd6cb57570b95f130a4
parent a0b517609dfd8436a98bdebb31466f19ffec6cb5
parent 0ac7f0b8c351209952890340b9b8ee7a2159b6b5

Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base

core/java/android/os/AsyncTask.java

diff --git a/core/java/android/os/AsyncTask.java b/core/java/android/os/AsyncTask.java
index 7d2c698..d28148c 100644
--- a/core/java/android/os/AsyncTask.java
+++ b/core/java/android/os/AsyncTask.java
@@ -82,7 +82,7 @@
  *     <li><code>Result</code>, the type of the result of the background
  *     computation.</li>
  * </ol>
- * <p>Not all types are always used by am asynchronous task. To mark a type as unused,
+ * <p>Not all types are always used by an asynchronous task. To mark a type as unused,
  * simply use the type {@link Void}:</p>
  * <pre>
  * private class MyTask extends AsyncTask&lt;Void, Void, Void&gt; { ... }