diff options
| author | Scott Main <smain@google.com> | 2012-11-14 19:10:18 -0800 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2012-11-14 19:10:18 -0800 |
| commit | 0034beab72d6574de5009e5947729a2bfd17d66e (patch) | |
| tree | 10b75b4b69e0f1eaa89934f53784cd05f4ac5f37 /docs/html/guide/guide_toc.cs | |
| parent | e3be79be3f81f1af67f4f6704ae452512065bce6 (diff) | |
| parent | 783e115b6008eb3425d1b3f82aff9fd5249b47aa (diff) | |
| download | frameworks_base-0034beab72d6574de5009e5947729a2bfd17d66e.zip frameworks_base-0034beab72d6574de5009e5947729a2bfd17d66e.tar.gz frameworks_base-0034beab72d6574de5009e5947729a2bfd17d66e.tar.bz2 | |
resolved conflicts for merge of 783e115b to jb-mr1-dev
Change-Id: Ibfd3023a845fb6cc549f05bcff2d6e4abc7e5a07
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 46c4398..d875f47 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -529,25 +529,6 @@ <li><a href="<?cs var:toroot ?>guide/practices/tablets-and-handsets.html"> <span class="en">Supporting Tablets and Handsets</span> </a></li> - <li class="nav-section"> - <div class="nav-section-header"><a href="<?cs var:toroot ?>guide/practices/performance.html"> - <span class="en">Designing for Performance</span> - </a></div> - <ul> - <li><a href="<?cs var:toroot ?>guide/practices/jni.html"> - <span class="en">JNI Tips</span> - </a></li> - </ul> - </li> - <li><a href="<?cs var:toroot ?>guide/practices/responsiveness.html"> - <span class="en">Designing for Responsiveness</span> - </a></li> - <li><a href="<?cs var:toroot ?>guide/practices/seamlessness.html"> - <span class="en">Designing for Seamlessness</span> - </a></li> - <li><a href="<?cs var:toroot ?>guide/practices/security.html"> - <span class="en">Designing for Security</span> - </a></li> </ul> </li> |