am e528cbdc: am 12313686: am ee3a3c1f: am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.

Merge commit 'e528cbdcb556d095b8d673c1d8933f1e5c1c6eab'

* commit 'e528cbdcb556d095b8d673c1d8933f1e5c1c6eab':
  doc change: include SDK Tools in notice to 1.6 developers.
This commit is contained in:
Dirk Dougherty 2009-10-28 23:48:14 -07:00 committed by Android Git Automerger
commit 3e7a1470c1

View file

@ -125,7 +125,7 @@ computer. </p>
you will notice several important differences:</p> you will notice several important differences:</p>
<div class="toggle-content-toggleme" style="display:none"> <div class="toggle-content-toggleme" style="display:none">
<ul> <ul style="padding-bottom:.0;">
<li style="margin-top:.5em">The SDK downloadable package includes <em>only</em> <li style="margin-top:.5em">The SDK downloadable package includes <em>only</em>
the latest version of the Android SDK Tools.</li> the latest version of the Android SDK Tools.</li>
<li>Once you've installed the SDK, you now use the Android SDK and AVD Manager <li>Once you've installed the SDK, you now use the Android SDK and AVD Manager
@ -138,11 +138,12 @@ computer. </p>
an SDK package again. Instead, you will use the Android SDK and AVD Manager to an SDK package again. Instead, you will use the Android SDK and AVD Manager to
keep your development environment up-to-date. </li> keep your development environment up-to-date. </li>
</ul> </ul>
<p>If you are currently using the Android 1.6 SDK, you do not need <p style="margin-top:0">If you are currently using the Android 1.6 SDK, you
to install the new SDK, because your existing SDK includes the Android SDK and do not need to install the new SDK, because your existing SDK already
AVD Manager tool. To develop against Android 2.0, for example, you can includes the Android SDK and AVD Manager tool. To develop against Android
just download the Android 2.0 platform into your existing SDK. Refer to 2.0, for example, you can just download the Android 2.0 platform (and
<a href="adding-components.html">Adding SDK Components</a>.</p> updated SDK Tools) into your existing SDK. Refer to <a
href="adding-components.html">Adding SDK Components</a>.</p>
</div> </div>
<a href='#' class='toggle-content-button show' onclick="toggleContent(this);return false;"> <a href='#' class='toggle-content-button show' onclick="toggleContent(this);return false;">
@ -151,7 +152,7 @@ computer. </p>
</div> </div>
<p>If you are new to the Android SDK, please read the <a href="#quickstart">Quick Start</a>, <p>If you are new to the Android SDK, please read the <a href="#quickstart">Quick Start</a>,
below, for an overview of the installation process and how to set up your environment.</p> below, for an overview of how to install and set up the SDK.</p>
<table class="download"> <table class="download">