am 4f170821: Merge "Fix typo and bug in CTS test class." into gingerbread

Merge commit '4f170821678099010ec593d2b5a081e0f8adf92d' into gingerbread-plus-aosp

* commit '4f170821678099010ec593d2b5a081e0f8adf92d':
  Fix typo and bug in CTS test class.

telephony/java/com/android/internal/telephony/PhoneSubInfo.java

@@ -111,7 +111,7 @@ public class PhoneSubInfo extends IPhoneSubInfo.Stub {
     }
 
     /**
-     * Retrieves the compelete voice mail number.
+     * Retrieves the complete voice mail number.
      *
      * @hide
      */

telephony/java/com/android/internal/telephony/test/SimulatedCommands.java

@@ -844,7 +844,6 @@ public final class SimulatedCommands extends BaseCommands
         ret[11] = null;
         ret[12] = null;
         ret[13] = null;
-        ret[14] = null;
 
         resultSuccess(result, ret);
     }