am 25c52b70: am 340c5c42: Separate the Settings activity name into two different...

Merge commit '25c52b70faceb24cade0f5480c372de3f47bdf79'

* commit '25c52b70faceb24cade0f5480c372de3f47bdf79':
  Separate the Settings activity name into two different strings.

diff --cc AndroidManifest.xml
index bc6f332,220c9c3..90c1355
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -48,9 -48,10 +48,10 @@@
  
          <!-- Settings -->
  
-         <activity android:name="Settings" android:label="@string/settings_label"
+         <activity android:name="Settings"
+                 android:label="@string/settings_label_launcher"
                  android:taskAffinity="com.android.settings"
 -                android:clearTaskOnLaunch="true"
 +                android:theme="@android:style/Theme.Holo"
                  android:launchMode="singleTop">
              <intent-filter>
                  <action android:name="android.intent.action.MAIN" />

diff --cc res/values/strings.xml
Simple merge