summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2013-04-09 10:47:50 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-04-09 10:47:50 -0700
commit405c6e2d656b628262ff3e3d0b79f58a46c839ec (patch)
tree9fe8ae24027d3dda65eede4cff2c0a4b15b2eed5
parent614c155fc6e4c3e83b152398df0e628d7a7f4051 (diff)
parentd3724e02d898b66a5b94cf0f2d3bbfaec5295b32 (diff)
am d3724e02: am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample
* commit 'd3724e02d898b66a5b94cf0f2d3bbfaec5295b32': fix xml error in sample
-rw-r--r--docs/html/training/basics/firstapp/building-ui.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/training/basics/firstapp/building-ui.jd b/docs/html/training/basics/firstapp/building-ui.jd
index 0f188618f440..2615bee81feb 100644
--- a/docs/html/training/basics/firstapp/building-ui.jd
+++ b/docs/html/training/basics/firstapp/building-ui.jd
@@ -240,7 +240,7 @@ the "hello_world" string.)</p>
&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>