diff options
| author | Scott Main <smain@google.com> | 2010-10-25 17:54:33 -0700 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2010-10-25 17:54:33 -0700 |
| commit | 024127c11f4431eb701f457789374081a7f6fca4 (patch) | |
| tree | 071da66140ffc71f85faeb5132ce692c830b67ed /docs/html/sdk/sdk_toc.cs | |
| parent | c841ef04eba47f95186e00ce69f7641f695e525b (diff) | |
| parent | f0b3fa60dba67e904a2336980ecbb937d32b2387 (diff) | |
| download | frameworks_base-024127c11f4431eb701f457789374081a7f6fca4.zip frameworks_base-024127c11f4431eb701f457789374081a7f6fca4.tar.gz frameworks_base-024127c11f4431eb701f457789374081a7f6fca4.tar.bz2 | |
resolved conflicts for merge of f0b3fa60 to master
Change-Id: Id15a8976a60548d50671d1c7af641302fce2f3d5
Diffstat (limited to 'docs/html/sdk/sdk_toc.cs')
| -rw-r--r-- | docs/html/sdk/sdk_toc.cs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs index fdf4438..d202b50 100644 --- a/docs/html/sdk/sdk_toc.cs +++ b/docs/html/sdk/sdk_toc.cs @@ -1,5 +1,5 @@ <?cs if:!sdk.redirect ?> -<ul><?cs +<ul><?cs if:android.whichdoc == "online" ?> <li> <h2> @@ -35,7 +35,7 @@ </a></li> </ul> - </li><?cs + </li><?cs /if ?> <li> <h2> @@ -61,13 +61,13 @@ </li> </ul> <ul> - <li><a href="<?cs var:toroot ?>sdk/android-2.2.html">Android 2.2 Platform</a> <span class="new">new!</span></li> + <li><a href="<?cs var:toroot ?>sdk/android-2.2.html">Android 2.2 Platform</a></li> <li><a href="<?cs var:toroot ?>sdk/android-2.1.html">Android 2.1 Platform</a></li> <li><a href="<?cs var:toroot ?>sdk/android-1.6.html">Android 1.6 Platform</a></li> <li><a href="<?cs var:toroot ?>sdk/android-1.5.html">Android 1.5 Platform</a></li> <li class="toggle-list"> <div><a href="#" onclick="toggle(this.parentNode.parentNode,true); return false;">Older Platforms</a></div> - <ul> + <ul> <li><a href="<?cs var:toroot ?>sdk/android-2.0.1.html">Android 2.0.1 Platform</a></li> <li><a href="<?cs var:toroot ?>sdk/android-2.0.html">Android 2.0 Platform</a></li> <li><a href="<?cs var:toroot ?>sdk/android-1.1.html">Android 1.1 Platform</a></li> @@ -75,8 +75,7 @@ </li> </ul> <ul> - <li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r7</a> - <span class="new">new!</span></li> + <li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r7</a></li> <li><a href="<?cs var:toroot ?>sdk/win-usb.html">USB Driver for Windows, r3</a> </li> @@ -116,8 +115,7 @@ <span style="display:none" class="zh-TW"></span> </h2> <ul> - <li><a href="<?cs var:toroot ?>sdk/ndk/index.html">Android NDK, r4b</a> - <span class="new">new!</span></li> + <li><a href="<?cs var:toroot ?>sdk/ndk/index.html">Android NDK, r4b</a></li> </ul> </li> <li> |