diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 64bfc95..316f105 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1044,6 +1044,20 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name="Settings$ManageDomainUrlsActivity"
+                  android:taskAffinity="com.android.settings"
+                  android:label="@string/domain_urls_title"
+                  android:icon="@drawable/ic_settings_memory">
+            <intent-filter>
+                <action android:name="android.settings.MANAGE_DOMAIN_URLS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                       android:value="com.android.settings.category.device" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.applications.ManageDomainUrls" />
+        </activity>
+
         <activity android:name="Settings$MemorySettingsActivity"
                 android:label="@string/memory_settings_title"
                 android:icon="@drawable/ic_settings_memory"
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 68c4b86..01b0632 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -119,7 +119,7 @@
     public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }
     public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class OtherSoundSettingsActivity extends SettingsActivity { /* empty */ }
-    public static class ManageDomainUrls extends SettingsActivity { /* empty */ }
+    public static class ManageDomainUrlsActivity extends SettingsActivity { /* empty */ }
 
     public static class TopLevelSettings extends SettingsActivity { /* empty */ }
     public static class ApnSettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 05d67b5..07ba414 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -64,6 +64,7 @@
 import com.android.settings.applications.InstalledAppDetails;
 import com.android.settings.applications.ManageApplications;
 import com.android.settings.applications.ManageAssist;
+import com.android.settings.applications.ManageDomainUrls;
 import com.android.settings.applications.NotificationApps;
 import com.android.settings.applications.ProcessStatsSummary;
 import com.android.settings.applications.ProcessStatsUi;
@@ -353,6 +354,7 @@
             WifiInfo.class.getName(),
             MasterClear.class.getName(),
             NightDisplaySettings.class.getName(),
+            ManageDomainUrls.class.getName(),
     };
 
 
