diff options
| author | Trevor Johns <trevorjohns@google.com> | 2016-04-12 10:13:47 -0700 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2016-04-19 02:03:59 -0700 |
| commit | 682c24e22811d4ee17ae1cd61bf255c3f7e722b7 (patch) | |
| tree | 14ae11892022b653871ede366b09277254704f5a /docs/html/guide/guide_toc.cs | |
| parent | 65136ac6a4f6fb2423a0768b451782dcd0e960d5 (diff) | |
Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index e99c15a14e6f..549a1b6b02e4 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -183,6 +183,7 @@ <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-feature-element.html"><uses-feature></a></li> <!-- ##api level 4## --> <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-library-element.html"><uses-library></a></li> <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-element.html"><uses-permission></a></li> + <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-sdk-23-element.html"><uses-permission-sdk-23></a></li> <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-sdk-element.html"><uses-sdk></a></li> </ul> </li><!-- end of the manifest file --> @@ -261,9 +262,6 @@ <li><a href="<?cs var:toroot ?>guide/topics/ui/menus.html"> <span class="en">Menus</span></span> </a></li> - <li><a href="<?cs var:toroot ?>guide/topics/ui/actionbar.html"> - <span class="en">Action Bar</span> - </a></li> <li><a href="<?cs var:toroot ?>guide/topics/ui/settings.html"> <span class="en">Settings</span> </a></li> |