am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample * commit '2568d7f0cb9ee568309a0347805a12b9e771b689': fix xml error in sample

commit: d3724e02d898b66a5b94cf0f2d3bbfaec5295b32 [log] [tgz]
author: Scott Main <smain@google.com> Tue Apr 09 10:43:38 2013 -0700
committer: Android Git Automerger <android-git-automerger@android.com> Tue Apr 09 10:43:38 2013 -0700
tree: 779acd6a505ffbb87cc5f9b8f601c3d984e069ff
parent: f64ad28f6b3c56c054f938680c58b69cf7237b2c [diff]
parent: 2568d7f0cb9ee568309a0347805a12b9e771b689 [diff]
diff --git a/docs/html/training/basics/firstapp/building-ui.jd b/docs/html/training/basics/firstapp/building-ui.jd
index 0f18861..2615bee 100644
--- a/docs/html/training/basics/firstapp/building-ui.jd
+++ b/docs/html/training/basics/firstapp/building-ui.jd

@@ -240,7 +240,7 @@
     &lt;string name="app_name">My First App&lt;/string>
     &lt;string name="edit_message">Enter a message&lt;/string>
     &lt;string name="button_send">Send&lt;/string>
-    &lt;string name="menu_settings">Settings&lt;/string>
+    &lt;string name="action_settings">Settings&lt;/string>
     &lt;string name="title_activity_main">MainActivity&lt;/string>
 &lt;/resources>
 </pre>
commit	d3724e02d898b66a5b94cf0f2d3bbfaec5295b32	[log] [tgz]
author	Scott Main <smain@google.com>	Tue Apr 09 10:43:38 2013 -0700
committer	Android Git Automerger <android-git-automerger@android.com>	Tue Apr 09 10:43:38 2013 -0700
tree	779acd6a505ffbb87cc5f9b8f601c3d984e069ff
parent	f64ad28f6b3c56c054f938680c58b69cf7237b2c [diff]
parent	2568d7f0cb9ee568309a0347805a12b9e771b689 [diff]