682c24e228
This undoes the automerger skip which occured in commit e740c84dc32180214a7fd157105d6c18d30408ee and replays it as a standard (NOT -s ours) merge. Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
74 lines
3.0 KiB
C#
74 lines
3.0 KiB
C#
<ul id="nav">
|
|
<li class="nav-section">
|
|
<div class="nav-section-header"><a href="<?cs var:toroot ?>about/versions/marshmallow/index.html">
|
|
<span class="en">Marshmallow</span></a></div>
|
|
<ul>
|
|
<li><a href="<?cs var:toroot ?>about/versions/marshmallow/android-6.0.html">
|
|
Android 6.0 APIs</a></li>
|
|
<li><a href="<?cs var:toroot ?>about/versions/marshmallow/android-6.0-changes.html">
|
|
Android 6.0 Changes</a></li>
|
|
<li><a href="<?cs var:toroot ?>about/versions/marshmallow/samples.html">
|
|
Android 6.0 Samples</a></li>
|
|
</ul>
|
|
</li>
|
|
<li class="nav-section">
|
|
<div class="nav-section-header"><a href="<?cs var:toroot ?>about/versions/lollipop.html"
|
|
zh-tw-lang="Lollipop"
|
|
zh-cn-lang="Lollipop"
|
|
ru-lang="Lollipop"
|
|
ko-lang="Lollipop"
|
|
ja-lang="Lollipop"
|
|
es-lang="Lollipop">
|
|
<span class="en">Lollipop</span></a></div>
|
|
<ul>
|
|
<li><a href="<?cs var:toroot ?>about/versions/android-5.1.html">Android 5.1 APIs</a></li>
|
|
<li><a href="<?cs var:toroot ?>about/versions/android-5.0.html"
|
|
zh-tw-lang="Android 5.0 API"
|
|
zh-cn-lang="Android 5.0 API"
|
|
ru-lang="API для Android 5.0"
|
|
ko-lang="Android 5.0 API"
|
|
ja-lang="Android 5.0 API"
|
|
es-lang="API de Android 5.0">
|
|
Android 5.0 APIs</a></li>
|
|
<li><a href="<?cs var:toroot ?>about/versions/android-5.0-changes.html">
|
|
|
|
Android 5.0 Changes</a></li>
|
|
</ul>
|
|
</li>
|
|
<li class="nav-section">
|
|
<div class="nav-section-header"><a href="<?cs var:toroot ?>about/versions/kitkat.html">
|
|
<span class="en">KitKat</span></a></div>
|
|
<ul>
|
|
<li><a href="<?cs var:toroot ?>about/versions/android-4.4.html">Android 4.4 APIs</a></li>
|
|
</ul>
|
|
</li>
|
|
<li class="nav-section">
|
|
<div class="nav-section-header"><a href="<?cs var:toroot ?>about/versions/jelly-bean.html">
|
|
<span class="en">Jelly Bean</span></a></div>
|
|
<ul>
|
|
<li><a href="<?cs var:toroot ?>about/versions/android-4.3.html">Android 4.3 APIs</a></li>
|
|
<li><a href="<?cs var:toroot ?>about/versions/android-4.2.html">Android 4.2 APIs</a></li>
|
|
<li><a href="<?cs var:toroot ?>about/versions/android-4.1.html">Android 4.1 APIs</a></li>
|
|
</ul>
|
|
</li>
|
|
|
|
<!-- <li class="nav-section">
|
|
<div class="nav-section-header"><a href="<?cs var:toroot ?>about/versions/android-4.0-highlights.html">
|
|
<span class="en">Ice Cream Sandwich</span></a></div>
|
|
<ul>
|
|
<li><a href="<?cs var:toroot ?>about/versions/android-4.0.3.html">Android 4.0.3 APIs</a></li>
|
|
<li><a href="<?cs var:toroot ?>about/versions/android-4.0.html">Android 4.0 APIs</a> </li>
|
|
</ul>
|
|
</li> -->
|
|
|
|
<li class="nav-section">
|
|
<div class="nav-section-header empty"><a href="<?cs
|
|
var:toroot?>about/android.html">About Android</a></div>
|
|
</li>
|
|
|
|
<li class="nav-section">
|
|
<div class="nav-section-header empty"><a href="<?cs
|
|
var:toroot?>about/dashboards/index.html">Dashboards</a></div>
|
|
</li>
|
|
|
|
</ul> |