summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-05-23 09:39:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-23 09:39:38 +0000
commitd7c91c0d07f81a38a421552186346787dca24873 (patch)
tree2d249b6f1e06073435e6aa1ba209e7bbfcb68e31
parent5940f4bd997a2da552073e92fc15971bc2834e5b (diff)
parent08162fec0c6fe49dbc190457e9a898c961467b60 (diff)
downloadframeworks_base-d7c91c0d07f81a38a421552186346787dca24873.zip
frameworks_base-d7c91c0d07f81a38a421552186346787dca24873.tar.gz
frameworks_base-d7c91c0d07f81a38a421552186346787dca24873.tar.bz2
am 08162fec: am 84fff53c: Merge "docs: M Preview - update the preview section TOC" into mnc-preview-docs
* commit '08162fec0c6fe49dbc190457e9a898c961467b60': docs: M Preview - update the preview section TOC
-rw-r--r--docs/html/preview/preview_toc.cs37
1 files changed, 18 insertions, 19 deletions
diff --git a/docs/html/preview/preview_toc.cs b/docs/html/preview/preview_toc.cs
index 5b1f022..7e9f292 100644
--- a/docs/html/preview/preview_toc.cs
+++ b/docs/html/preview/preview_toc.cs
@@ -16,31 +16,30 @@
</li>
<li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/api-overview.html">
- API Overview</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/api-changes.html">
- Behavior Changes</a></div>
+ <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/testing/guide.html">
+ Testing Guide</a></div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>preview/testing/performance.html">
+ Performance Testing</a></li>
+ </ul>
</li>
<li class="nav-section">
- <div class="nav-section-header empty">
- <a href="<?cs var:toroot ?>preview/features/runtime-permissions.html">
- Runtime Permissions</a></div>
- </li>
-
- <li class="nav-section">
- <div class="nav-section-header empty">
- <a href="<?cs var:toroot ?>preview/backup/index.html">
- Automatic Backups</a></div>
+ <div class="nav-section-header"><a href="<?cs var:toroot ?>preview/api-overview.html">
+ API Overview</a></div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>preview/features/runtime-permissions.html">
+ Runtime Permissions</a></li>
+ <li><a href="<?cs var:toroot ?>preview/features/app-linking.html">
+ App Linking</a></li>
+ <li><a href="<?cs var:toroot ?>preview/backup/index.html">
+ Automatic Backups</a></li>
+ </ul>
</li>
<li class="nav-section">
- <div class="nav-section-header empty">
- <a href="<?cs var:toroot ?>preview/data-binding/guide.html">
- Data Binding</a></div>
+ <div class="nav-section-header empty"><a href="<?cs var:toroot ?>preview/api-changes.html">
+ Behavior Changes</a></div>
</li>
<li class="nav-section">