merge from open-source master

2009-08-21 10:19:09 -07:00
parent c813129fe7 34d7fd715f
commit 1afb1cd387
2 changed files with 2 additions and 2 deletions
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -4013,7 +4013,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
     * @param resultCode Result code, if any, from this Activity.
     * @param resultData Result data (Intent), if any, from this Activity.
     * 
-     * @result Returns true if the activity successfully finished, or false if it is still running.
+     * @return Returns true if the activity successfully finished, or false if it is still running.
     */
    public final boolean finishActivity(IBinder token, int resultCode, Intent resultData) {
        // Refuse possible leaked file descriptors