summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics/ui
diff options
context:
space:
mode:
authorNatalie Masse <nmasse@google.com>2014-10-24 22:36:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-24 22:36:54 +0000
commit60144a7a06d818e7ef22d08722be67c602aeb088 (patch)
treea39293556241aa277dd2095bbbc2daf9f1e89f60 /docs/html/guide/topics/ui
parentc220d8e57ca97c70db1fd72f040bd6c6f70bbf13 (diff)
parentbcf9ced47a123220271fcca70f71c2adf69ad100 (diff)
downloadframeworks_base-60144a7a06d818e7ef22d08722be67c602aeb088.zip
frameworks_base-60144a7a06d818e7ef22d08722be67c602aeb088.tar.gz
frameworks_base-60144a7a06d818e7ef22d08722be67c602aeb088.tar.bz2
am bcf9ced4: am 1e5bb861: Link and typo fixed
* commit 'bcf9ced47a123220271fcca70f71c2adf69ad100': Link and typo fixed
Diffstat (limited to 'docs/html/guide/topics/ui')
-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 a61696a..d972c47 100644
--- a/docs/html/guide/topics/ui/actionbar.jd
+++ b/docs/html/guide/topics/ui/actionbar.jd
@@ -1427,7 +1427,7 @@ href="#ActionView">action views</a>.</dd>
<p>Here's an example that defines a custom theme for an activity, {@code CustomActivityTheme},
that includes several styles to customize the action bar.</p>
-<p>Notice that there are two version for each action bar style property. The first one
+<p>Notice that there are two versions for each action bar style property. The first one
includes the {@code android:} prefix on the property name to support API levels 11 and higher
that include these properties in the framework. The second version does <em>not</em>
include the {@code android:} prefix and is for older versions of the platform, on which