diff options
| author | Scott Main <smain@google.com> | 2013-04-09 10:50:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-09 10:50:29 -0700 |
| commit | b4c13c4b045f4d96c377ba1fb9d834c111412a8c (patch) | |
| tree | f1472a2507178bfe3aa0b865da22b123257fc466 /docs | |
| parent | 558a3c1b7b40eb9356f8c4446ca63af8cf16bd91 (diff) | |
| parent | 405c6e2d656b628262ff3e3d0b79f58a46c839ec (diff) | |
| download | frameworks_base-b4c13c4b045f4d96c377ba1fb9d834c111412a8c.zip frameworks_base-b4c13c4b045f4d96c377ba1fb9d834c111412a8c.tar.gz frameworks_base-b4c13c4b045f4d96c377ba1fb9d834c111412a8c.tar.bz2 | |
am 405c6e2d: am d3724e02: am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample
* commit '405c6e2d656b628262ff3e3d0b79f58a46c839ec':
fix xml error in sample
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/training/basics/firstapp/building-ui.jd | 2 |
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 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 @@ the "hello_world" string.)</p> <string name="app_name">My First App</string> <string name="edit_message">Enter a message</string> <string name="button_send">Send</string> - <string name="menu_settings">Settings</string> + <string name="action_settings">Settings</string> <string name="title_activity_main">MainActivity</string> </resources> </pre> |