AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

Automated import of CL 144245
2009-04-02 11:00:54 -07:00
parent 3afdd56470
commit 04e71b3db8
189 changed files with 24484 additions and 8162 deletions
--- a/telephony/java/com/android/internal/telephony/ATResponseParser.java
+++ b/telephony/java/com/android/internal/telephony/ATResponseParser.java
@@ -34,7 +34,7 @@ public class ATResponseParser
    {
        this.line = line;
    }
-    
+
    public boolean
    nextBoolean()
    {
@@ -147,7 +147,7 @@ public class ATResponseParser
        }
    }

- 
+
    /** Throws ATParseEx if whitespace extends to the end of string */
    private char
    skipWhiteSpace (char c)