From 016584023383953d3b8c9f1537165a00313a792a Mon Sep 17 00:00:00 2001
From: Kevin Ruland <kruland@sunflower.com>
Date: Sun, 26 Feb 2012 00:27:14 +0000
Subject: [PATCH] Failed to commit the AndroidManifest.xml when I changed the
 main and openrocketloader classes to use ActionBarFragmentActivity.

---
 android/AndroidManifest.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 5d8e63761..c0d28a011 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -19,8 +19,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".android.Main"
-            android:theme="@style/AppTheme.NoTitleBar" >
+            android:name=".android.Main">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -28,8 +27,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".android.rocket.OpenRocketLoaderActivity"
-            android:theme="@style/AppTheme.NoTitleBar" >
+            android:name=".android.rocket.OpenRocketLoaderActivity">
 
             <!--
                  I don't understand why I need to have two different intent filters.