diff options
| author | 2013-12-26 15:33:52 -0800 | |
|---|---|---|
| committer | 2013-12-26 15:33:52 -0800 | |
| commit | 317109dfaf0682f6ffbf11d71f3da84dfa295df6 (patch) | |
| tree | d9abf23a83fad0f9a43318c8b771c5b660b22fc4 | |
| parent | b889885e9b5a605329ff8d7a35c373c88abf8c35 (diff) | |
| parent | e94bca2d8491e4b38fc987dbfe1f8fe0a4384c8f (diff) | |
am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs
* commit 'e94bca2d8491e4b38fc987dbfe1f8fe0a4384c8f':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521
| -rw-r--r-- | docs/html/guide/topics/manifest/manifest-element.jd | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/docs/html/guide/topics/manifest/manifest-element.jd b/docs/html/guide/topics/manifest/manifest-element.jd index cce951e00d08..12690d2fe703 100644 --- a/docs/html/guide/topics/manifest/manifest-element.jd +++ b/docs/html/guide/topics/manifest/manifest-element.jd @@ -25,12 +25,16 @@ parent.link=manifest-intro.html <dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code></dd> <dt>can contain:</dt> -<dd><code><a href="{@docRoot}guide/topics/manifest/instrumentation-element.html"><instrumentation></a></code> +<dd><code><a href="{@docRoot}guide/topics/manifest/compatible-screens-element.html"><compatible-screens></a></code> +<br/><code><a href="{@docRoot}guide/topics/manifest/instrumentation-element.html"><instrumentation></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code> +<br/><code><a href="{@docRoot}guide/topics/manifest/supports-gl-texture.html"><supports-gl-texture></a></code +<br/><code><a href="{@docRoot}guide/topics/manifest/supports-screens-element.html"><supports-screens></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/uses-configuration-element.html"><uses-configuration></a></code> <!-- ##api level 3## --> -<br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code></dd> +<br/><code><a href="{@docRoot}guide/topics/manifest/uses-feature-element.html"><uses-feature></a></code> +<br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><uses-sdk></a></code></dd> <p> @@ -189,4 +193,4 @@ more information about using this attribute (including how to maintain backward <dd> <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code></dd> -</dl> +</dl>
\ No newline at end of file |