Rename Exchange to Exchange Services

Bug: 3500114
Change-Id: I0aad231fef211ee488fa0fbb7414b23b37f3a6e0
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 98376f2..83c8c96 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -67,7 +67,7 @@
 
     <application
         android:icon="@mipmap/icon"
-        android:label="@string/account_setup_account_type_exchange_action"
+        android:label="@string/app_name"
         android:name="Exchange"
         android:theme="@android:style/Theme.Holo.Light"
         >
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 490d5be..3f9aa3c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -86,12 +86,8 @@
         automatically enabled for pre-existing Exchange accounts on upgrade -->
     <string name="notification_exchange_calendar_added">Exchange calendar added</string>
 
-    <string name="account_setup_account_type_exchange_action"
-        translatable="false">Exchange</string>
-    <!-- Do Not Translate. "Add new email account" screen, button name in response
-        to what type of account this is -->
-    <string name="account_setup_account_type_exchange_action_alternate"
-        translatable="false">Microsoft Exchange ActiveSync</string>
+    <!-- The name of this APK as shown in manage applications settings. [CHAR LIMIT=30] -->
+    <string name="app_name" >Exchange Services</string>
 
     <!-- Used as the body text of a message reporting to an attendee that a
         specific instance of a recurring meeting has been canceled -->