Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '9714cbdf4aaa303e8b85faae022eefe83996e29e':
  docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515
This commit is contained in:
quddusc
2014-01-14 20:39:19 +00:00
committed by Android Git Automerger
parent 1746de3389 9714cbdf4a
commit ee1b0bfd64
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/html/guide/topics/manifest/application-element.jd
View File

@@ -40,6 +40,7 @@ page.title=&lt;application&gt;
<dt>can contain:</dt>
<dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code>

4
docs/html/guide/topics/manifest/meta-data-element.jd
View File

@@ -12,8 +12,10 @@ parent.link=manifest-intro.html
<dt>contained in:</dt>
<dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></code></dd>
<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>
<dt>description:</dt>
<dd>A name-value pair for an item of additional, arbitrary data that can