From a686541f96971bc853abe97b9983fc04d6e6e861 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 30 Nov 2016 06:58:56 -0800
Subject: [PATCH] merge recent manifest changes

---
 xwords4/android/XWords4-dbg/AndroidManifest.xml | 3 ++-
 xwords4/android/XWords4/AndroidManifest.xml     | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/xwords4/android/XWords4-dbg/AndroidManifest.xml b/xwords4/android/XWords4-dbg/AndroidManifest.xml
index f319a6e0d..0107ec9f8 100644
--- a/xwords4/android/XWords4-dbg/AndroidManifest.xml
+++ b/xwords4/android/XWords4-dbg/AndroidManifest.xml
@@ -6,7 +6,7 @@
      to come from a domain that you own or have control over. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.eehouse.android.xw4dbg"
-          android:versionCode="107"
+          android:versionCode="109"
           android:versionName="@string/app_version"
           >
 
@@ -99,6 +99,7 @@
 			  android:label="@string/p2p_invite_title"
               android:configChanges="keyboardHidden|orientation|screenSize"
               />
+
     <activity android:name="GameConfigActivity"
               android:screenOrientation="sensor"
               android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/xwords4/android/XWords4/AndroidManifest.xml b/xwords4/android/XWords4/AndroidManifest.xml
index 50bfc2c48..587550dc3 100644
--- a/xwords4/android/XWords4/AndroidManifest.xml
+++ b/xwords4/android/XWords4/AndroidManifest.xml
@@ -57,7 +57,7 @@
                android:name=".XWApp"
                >
 
-    <activity android:name="MainActivity" 
+    <activity android:name="MainActivity"
               android:label="@string/app_name"
               android:launchMode="standard"
               android:configChanges="keyboardHidden|orientation|screenSize"
@@ -197,6 +197,8 @@
               />
 
     <service android:name="RelayService"/>
+    <service android:name="BTService"/>
+    <service android:name="SMSService"/>
 
     <receiver android:name=".MountEventReceiver">
         <intent-filter>
@@ -218,8 +220,6 @@
       </intent-filter>
     </receiver>
 
-    <service android:name="BTService"/>
-
     <receiver android:name="SMSReceiver" >
       <intent-filter>
         <action android:name="android.intent.action.DATA_SMS_RECEIVED" /> 
@@ -230,8 +230,6 @@
 
     </receiver>
 
-    <service android:name="SMSService"/>
-
     <receiver android:name="com.google.android.gcm.GCMBroadcastReceiver" 
               android:permission="com.google.android.c2dm.permission.SEND" >
       <intent-filter>