am ce8436f5: Merge change 3593 into donut

Merge commit 'ce8436f52e7f2c80f94e43d80d28cc962b7ff83b'

* commit 'ce8436f52e7f2c80f94e43d80d28cc962b7ff83b':
  Cleanup whitespace.

4 files changed, 23 insertions, 23 deletions

diff --git a/telephony/java/android/telephony/JapanesePhoneNumberFormatter.java b/telephony/java/android/telephony/JapanesePhoneNumberFormatter.java
index 8a82966..6390d8e 100644
--- a/telephony/java/android/telephony/JapanesePhoneNumberFormatter.java
+++ b/telephony/java/android/telephony/JapanesePhoneNumberFormatter.java
@@ -21,11 +21,11 @@ import android.text.Editable;
 /*
  * Japanese Phone number formatting rule is a bit complicated.
  * Here are some valid examples:
- * 
+ *
  * 022-229-1234 0223-23-1234 022-301-9876 015-482-7849 0154-91-3478
  * 01547-5-4534 090-1234-1234 080-0123-6789
  * 0800-000-9999 0570-000-000 0276-00-0000
- * 
+ *
  * As you can see, there is no straight-forward rule here.
  * In order to handle this, a big array is prepared.
  */
@@ -151,14 +151,14 @@ import android.text.Editable;
     -100, -100, -45, -45, -100, -100, -100, -100, -100, -100,
     -25, -35, -35, -35, -35, -35, -35, -25, -25, -35,
     -35, -35, -35, -35, -35, -35, -35, -35, -35, -45};
-    
+
     public static void format(Editable text) {
         // Here, "root" means the position of "'":
         // 0'3, 0'90, and +81'-90
         // (dash will be deleted soon, so it is actually +81'90).
         int rootIndex = 1;
         int length = text.length();
-        if (length > 3 
+        if (length > 3
                 && text.subSequence(0, 3).toString().equals("+81")) {
             rootIndex = 3;
         } else if (length < 1 || text.charAt(0) != '0') {
@@ -176,10 +176,10 @@ import android.text.Editable;
                 i++;
             }
         }
-        
+
         length = text.length();
         int dashposition;
-        
+
         i = rootIndex;
         int base = 0;
         while (i < length) {
@@ -208,7 +208,7 @@ import android.text.Editable;
                 i++;
             }
         }
-        
+
         if (length > 3 && rootIndex == 3) {
             text.insert(rootIndex, "-");
         }
diff --git a/telephony/java/android/telephony/NeighboringCellInfo.aidl b/telephony/java/android/telephony/NeighboringCellInfo.aidl
index a7e709e..c464332 100644
--- a/telephony/java/android/telephony/NeighboringCellInfo.aidl
+++ b/telephony/java/android/telephony/NeighboringCellInfo.aidl
@@ -2,16 +2,16 @@
 **
 ** Copyright 2007, The Android Open Source Project
 **
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
 **
-**     http://www.apache.org/licenses/LICENSE-2.0 
+**     http://www.apache.org/licenses/LICENSE-2.0
 **
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
 ** limitations under the License.
 */
 
diff --git a/telephony/java/android/telephony/NeighboringCellInfo.java b/telephony/java/android/telephony/NeighboringCellInfo.java
index 326401a..f492abd 100644
--- a/telephony/java/android/telephony/NeighboringCellInfo.java
+++ b/telephony/java/android/telephony/NeighboringCellInfo.java
@@ -20,7 +20,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 /**
- * Represents the neighboring cell information, including 
+ * Represents the neighboring cell information, including
  * Received Signal Strength and Cell ID location.
  */
 public class NeighboringCellInfo implements Parcelable
@@ -52,7 +52,7 @@ public class NeighboringCellInfo implements Parcelable
         mRssi = rssi;
         mCid = cid;
     }
-    
+
     /**
      * Initialize the object from a parcel.
      */
@@ -60,12 +60,12 @@ public class NeighboringCellInfo implements Parcelable
         mRssi = in.readInt();
         mCid = in.readInt();
     }
-    
+
     /**
-     * @return received signal strength in "asu", ranging from 0 - 31, 
+     * @return received signal strength in "asu", ranging from 0 - 31,
      * or UNKNOWN_RSSI if unknown
      *
-     * For GSM, dBm = -113 + 2*asu, 
+     * For GSM, dBm = -113 + 2*asu,
      * 0 means "-113 dBm or less" and 31 means "-51 dBm or greater"
      */
     public int getRssi() {
@@ -95,7 +95,7 @@ public class NeighboringCellInfo implements Parcelable
 
     @Override
     public String toString() {
-        return "["+ ((mCid == UNKNOWN_CID) ? "/" : Integer.toHexString(mCid)) 
+        return "["+ ((mCid == UNKNOWN_CID) ? "/" : Integer.toHexString(mCid))
         + " at " + ((mRssi == UNKNOWN_RSSI)? "/" : mRssi) + "]";
     }
 
@@ -105,7 +105,7 @@ public class NeighboringCellInfo implements Parcelable
 
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(mRssi);
-        dest.writeInt(mCid);        
+        dest.writeInt(mCid);
     }
 
     public static final Parcelable.Creator<NeighboringCellInfo> CREATOR
diff --git a/telephony/java/android/telephony/package.html b/telephony/java/android/telephony/package.html
index aee4a6f..cb2fb49 100644
--- a/telephony/java/android/telephony/package.html
+++ b/telephony/java/android/telephony/package.html
@@ -1,6 +1,6 @@
 <HTML>
 <BODY>
-Provides APIs for monitoring the basic phone information, such as 
+Provides APIs for monitoring the basic phone information, such as
 the network type and connection state, plus utilities
 for manipulating phone number strings.
 </BODY>