commit f9e024198d3b16454287888bd5d40fee23390d23
author Wink Saville Thu Apr 02 01:37:03 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu Apr 02 01:37:03 2009 -0700
tree 111fcc6911cc13c20c271ce793b7124a55fba0dd
parent b20dd917e2d29045225985baa980a2a8e22e10fc

AI 144185: Integrate cdma into the main code base.

Automated import of CL 144185

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7b3e689..6e3bfde 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -240,7 +240,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="SimLockSettings" android:label="@string/sim_lock_settings"
+        <activity android:name="IccLockSettings" android:label="@string/sim_lock_settings"
                 android:process="com.android.phone">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -442,7 +442,7 @@
         </activity>
 
         <activity android:name="ProxySelector" android:label="@string/proxy_settings_label"
-		  android:theme="@android:style/Theme.Dialog">
+                android:theme="@android:style/Theme.Dialog">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -502,3 +502,5 @@
 
 </manifest>
 
+
+