commit 2b8e6d646537d130570867851b07298c05b8097e
author Santos Cordon <santoscordon@google.com> Wed Sep 04 17:43:48 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 04 17:43:48 2013 -0700
tree c75518e008fe8e392194d97b604c8e3f0761fcb5
parent 6a483e7992cce81bb0f98c25090a9566ba12b63e
parent 26132990578b13f432c3c3343053565e592073f7

am 26132990: am 55d46030: Merge "Changing incall ui label to the already translated "Phone"" into klp-dev

* commit '26132990578b13f432c3c3343053565e592073f7':
  Changing incall ui label to the already translated "Phone"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6f3450f..72e41dc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -262,7 +262,7 @@
              fullScreenIntent of a notification (for incoming calls.) -->
         <activity android:name="com.android.incallui.InCallActivity"
                   android:theme="@style/Theme.InCallScreen"
-                  android:label="@string/inCallLabel"
+                  android:label="@string/phoneAppLabel"
                   android:excludeFromRecents="true"
                   android:launchMode="singleInstance"
                   android:screenOrientation="nosensor"