summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics/manifest/action-element.jd
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2014-02-12 21:19:00 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-12 21:19:00 -0800
commitaa4cfa0c3a04ea1289994a530044e111f21a439c (patch)
tree674cec9b923196a97aa83e9be5f3d825e42087ca /docs/html/guide/topics/manifest/action-element.jd
parent1fc47a071b45368e6da0601ec640f2547489224c (diff)
parenta97e17785714e5155184199161b3d288f13d0134 (diff)
downloadframeworks_base-aa4cfa0c3a04ea1289994a530044e111f21a439c.zip
frameworks_base-aa4cfa0c3a04ea1289994a530044e111f21a439c.tar.gz
frameworks_base-aa4cfa0c3a04ea1289994a530044e111f21a439c.tar.bz2
am a97e1778: Merge commit \'47d3eaf6\' into manualmerge
* commit 'a97e17785714e5155184199161b3d288f13d0134': Doc change: minor edits to support easier extraction of document summaries.
Diffstat (limited to 'docs/html/guide/topics/manifest/action-element.jd')
-rw-r--r--docs/html/guide/topics/manifest/action-element.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/topics/manifest/action-element.jd b/docs/html/guide/topics/manifest/action-element.jd
index 037d0dc..54ee6ae 100644
--- a/docs/html/guide/topics/manifest/action-element.jd
+++ b/docs/html/guide/topics/manifest/action-element.jd
@@ -12,7 +12,7 @@ parent.link=manifest-intro.html
<p>
<dt>description:</dt>
-<dd>Adds an action to an intent filter.
+<dd itemprop="description">Adds an action to an intent filter.
An <code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> element must contain
one or more {@code &lt;action&gt;} elements. If it doesn't contain any, no
Intent objects will get through the filter. See