diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 511dc86a939ec..cedca164b70c6 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1520,18 +1520,6 @@
-
-
-
-
-
-
@@ -1601,12 +1589,6 @@
-
-
-
diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
index 50734efacac96..68af4652cfa15 100644
--- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
+++ b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
@@ -894,7 +894,6 @@ public class PackageManagerSettingsTests {
+ ""
+ " "
+ " "
- + " "
+ " "
+ ""
+ ""