diff options
| author | Jake Hamby <jhamby@google.com> | 2010-08-13 14:53:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-13 14:53:03 -0700 |
| commit | 164eb050bdbaacb83e48a00c56b78d3c587a6e34 (patch) | |
| tree | e0daa92ffd7c2332ced6316e47f326b421c7648e /telephony | |
| parent | 44e0d5ca752db52f2f02e475ecd254b676e50be2 (diff) | |
| parent | 4f170821678099010ec593d2b5a081e0f8adf92d (diff) | |
| download | frameworks_base-164eb050bdbaacb83e48a00c56b78d3c587a6e34.zip frameworks_base-164eb050bdbaacb83e48a00c56b78d3c587a6e34.tar.gz frameworks_base-164eb050bdbaacb83e48a00c56b78d3c587a6e34.tar.bz2 | |
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.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/PhoneSubInfo.java | 2 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/test/SimulatedCommands.java | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/PhoneSubInfo.java b/telephony/java/com/android/internal/telephony/PhoneSubInfo.java index 86c86bb..a45cad1 100644 --- a/telephony/java/com/android/internal/telephony/PhoneSubInfo.java +++ b/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 */ diff --git a/telephony/java/com/android/internal/telephony/test/SimulatedCommands.java b/telephony/java/com/android/internal/telephony/test/SimulatedCommands.java index a120f52..9c72e5a 100644 --- a/telephony/java/com/android/internal/telephony/test/SimulatedCommands.java +++ b/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); } |