commit 65c6b13b32e3ba3d7451bb7c22084f05620dee22
author Yorke Lee <yorkelee@google.com> Sat Sep 13 08:00:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Sep 13 08:00:03 2014 +0000
tree 071fedd9c023907c9f76ffb4cd28eed726785ca0
parent da45c001c0353e243b43868169c4dfdfe82a6b72
parent 7b5e71072452d517340520c900659aa7b8c21353

am 7b5e7107: am fb122f3c: Merge "Fix build break" into lmp-ub-dev

* commit '7b5e71072452d517340520c900659aa7b8c21353':
  Fix build break

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9bc9a58..20767d1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -437,7 +437,7 @@
         </activity>
 
         <activity android:name=".settings.PhoneAccountSelectionPreferenceActivity"
-                  android:label="@string/phone_accounts"
+                  android:label="@string/phone_accounts_selection_header"
                   android:theme="@style/DialerSettingsLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />