diff options
| author | quddusc <quddusc@google.com> | 2014-01-14 20:29:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-14 20:29:28 +0000 |
| commit | cc29a17056e4ae656182bf2fb36536b25ab4fcae (patch) | |
| tree | 7d8093f026dcaf78b9fac7b3b872c4c58dbbd0e2 /docs/html/guide/topics | |
| parent | 64231d01dead59752ff230570cbe07f206d5c9ec (diff) | |
| parent | c3e54987044d92f8e8d0fea1ce31b505bb0afb12 (diff) | |
| download | frameworks_base-cc29a17056e4ae656182bf2fb36536b25ab4fcae.zip frameworks_base-cc29a17056e4ae656182bf2fb36536b25ab4fcae.tar.gz frameworks_base-cc29a17056e4ae656182bf2fb36536b25ab4fcae.tar.bz2 | |
Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs
Diffstat (limited to 'docs/html/guide/topics')
| -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 6bfa3dc..46500aa 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 56a214c..ee80c84 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 |