summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-06-03 14:43:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-03 14:43:31 -0700
commite91a45a6cf8410771db07ffbdb52c6dfd0bf739d (patch)
treec62f0de84be9ea5351a964b86ed4acab2e46923a /docs
parent2515db74fe2e75018f618591fabe23fda8362bf3 (diff)
parent5c6e95a77359bd6f758164b7f5a5a92093c2498f (diff)
downloadframeworks_base-e91a45a6cf8410771db07ffbdb52c6dfd0bf739d.zip
frameworks_base-e91a45a6cf8410771db07ffbdb52c6dfd0bf739d.tar.gz
frameworks_base-e91a45a6cf8410771db07ffbdb52c6dfd0bf739d.tar.bz2
am 5c6e95a7: am ce214df9: am f58e6c98: Merge "doc typo" into honeycomb-mr2
* commit '5c6e95a77359bd6f758164b7f5a5a92093c2498f': doc typo
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/ui/actionbar.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd
index 7e13569..6f12b95 100644
--- a/docs/html/guide/topics/ui/actionbar.jd
+++ b/docs/html/guide/topics/ui/actionbar.jd
@@ -184,7 +184,7 @@ href="{@docRoot}guide/topics/resources/menu-resource.html">menu resource</a> fil
<pre>
&lt;?xml version="1.0" encoding="utf-8"?&gt;
&lt;menu xmlns:android="http://schemas.android.com/apk/res/android">
- &lt;item android:id="@+id/menu_add"
+ &lt;item android:id="@+id/menu_save"
android:icon="@drawable/ic_menu_save"
android:title="@string/menu_save"
<b>android:showAsAction="ifRoom|withText"</b> /&gt;