From 7df74a124129acd03e34660da9002f1feefda687 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Thu, 11 Oct 2012 10:19:36 -0700
Subject: [PATCH] Bug 793053 - Part 2: include new manifest fragments.
 r=blassey

---
 mobile/android/base/AndroidManifest.xml.in                     | 3 +++
 .../manifests/AnnouncementsAndroidManifest_activities.xml.in   | 0
 .../manifests/AnnouncementsAndroidManifest_permissions.xml.in  | 0
 .../manifests/AnnouncementsAndroidManifest_services.xml.in     | 0
 4 files changed, 3 insertions(+)
 create mode 100644 mobile/android/services/manifests/AnnouncementsAndroidManifest_activities.xml.in
 create mode 100644 mobile/android/services/manifests/AnnouncementsAndroidManifest_permissions.xml.in
 create mode 100644 mobile/android/services/manifests/AnnouncementsAndroidManifest_services.xml.in

diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index a925d6a06b1..a55362f87c2 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -17,6 +17,7 @@
     <uses-sdk android:minSdkVersion="8"
               android:targetSdkVersion="14"/>
 
+#include ../services/manifests/AnnouncementsAndroidManifest_permissions.xml.in
 #include ../services/manifests/SyncAndroidManifest_permissions.xml.in
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
@@ -169,6 +170,7 @@
           </intent-filter>
         </activity>
 
+#include ../services/manifests/AnnouncementsAndroidManifest_activities.xml.in
 #include ../services/manifests/SyncAndroidManifest_activities.xml.in
 
 #if MOZ_CRASHREPORTER
@@ -241,6 +243,7 @@
         </service>
 
 
+#include ../services/manifests/AnnouncementsAndroidManifest_services.xml.in
 #include ../services/manifests/SyncAndroidManifest_services.xml.in
     </application>
 
diff --git a/mobile/android/services/manifests/AnnouncementsAndroidManifest_activities.xml.in b/mobile/android/services/manifests/AnnouncementsAndroidManifest_activities.xml.in
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/mobile/android/services/manifests/AnnouncementsAndroidManifest_permissions.xml.in b/mobile/android/services/manifests/AnnouncementsAndroidManifest_permissions.xml.in
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/mobile/android/services/manifests/AnnouncementsAndroidManifest_services.xml.in b/mobile/android/services/manifests/AnnouncementsAndroidManifest_services.xml.in
new file mode 100644
index 00000000000..e69de29bb2d