diff options
| author | 2014-01-14 20:39:19 +0000 | |
|---|---|---|
| committer | 2014-01-14 20:39:19 +0000 | |
| commit | ee1b0bfd640641c3b75f751568ead18720ddb60c (patch) | |
| tree | 170892ffcf4d7d0237db68a139a2f49a64fd9f5f | |
| parent | 1746de33894b8f9a20e14338908f82df9a699d82 (diff) | |
| parent | 9714cbdf4aaa303e8b85faae022eefe83996e29e (diff) | |
am 9714cbdf: am 21627274: am cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs
* commit '9714cbdf4aaa303e8b85faae022eefe83996e29e':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515
| -rw-r--r-- | docs/html/guide/topics/manifest/application-element.jd | 1 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/meta-data-element.jd | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/html/guide/topics/manifest/application-element.jd b/docs/html/guide/topics/manifest/application-element.jd index 6bfa3dc8aee8..46500aafa8ec 100644 --- a/docs/html/guide/topics/manifest/application-element.jd +++ b/docs/html/guide/topics/manifest/application-element.jd @@ -40,6 +40,7 @@ page.title=<application> <dt>can contain:</dt> <dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code> +<br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code> diff --git a/docs/html/guide/topics/manifest/meta-data-element.jd b/docs/html/guide/topics/manifest/meta-data-element.jd index 56a214c6455b..ee80c8460ca4 100644 --- a/docs/html/guide/topics/manifest/meta-data-element.jd +++ b/docs/html/guide/topics/manifest/meta-data-element.jd @@ -12,8 +12,10 @@ parent.link=manifest-intro.html <dt>contained in:</dt> <dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code> +<br/><code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> +<br/><code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code></dd> +<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code> <dt>description:</dt> <dd>A name-value pair for an item of additional, arbitrary data that can |