merge from open-source master

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

wifi/java/android/net/wifi/WifiManager.java

@@ -960,7 +960,7 @@ public class WifiManager {
          *
          * If this MulticastLock is not reference-counted, the first call to
          * {@code release} (after the radio was multicast locked using
-         * {@linke #acquire}) will unlock the multicast, and subsequent calls
+         * {@link #acquire}) will unlock the multicast, and subsequent calls
          * will be ignored.
          *
          * Note that if any other Wifi Multicast Locks are still outstanding