am 18ff0e32: am 1067c3cb: Merge change Ia5ef9acd into eclair

Merge commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99' into eclair-mr2-plus-aosp * commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99': remove an old STOPSHIP comment
2009-12-09 15:40:06 -08:00
parent dbdabca716 18ff0e329b
commit 517ebaa69a
1 changed files with 0 additions and 1 deletions
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -1142,7 +1142,6 @@ public abstract class Context {
     * Use with {@link #getSystemService} to retrieve a
     * {@link android.accounts.AccountManager} for receiving intents at a
     * time of your choosing.
-     * TODO STOPSHIP perform a final review of the the account apis before shipping
     *
     * @see #getSystemService
     * @see android.accounts.AccountManager