am af2a2a61: am 4d545a82: Merge change 23037 into donut

Merge commit 'af2a2a61ed0b60efa4b0e8852333ed4693834aca' into eclair-plus-aosp

* commit 'af2a2a61ed0b60efa4b0e8852333ed4693834aca':
  Doc changes for SDK update.
This commit is contained in:
Dirk Dougherty 2009-09-02 19:01:33 -07:00 committed by Android Git Automerger
commit 5043a836a7

View file

@ -110,16 +110,18 @@ computer. </p>
Android 1.6 and we are pleased to announce the availability of an early look
SDK to give you a head-start on developing applications for it. </p>
<p>The Android 1.6 platform includes a variety of improvements and new
features for users and developers. Additionally, the SDK itself introduces
several new capabilities that enable you to develop applications more
efficiently. See the <a href="features.html">Android 1.6 Highlights</a>
document for a list of highlights.</p>
<?cs /if ?>
<p>The Android <?cs var:sdk.preview.version ?> platform includes a variety of
improvements and new features for users and developers. Additionally, the SDK
itself introduces several new capabilities that enable you to develop
applications more efficiently. See the <a href="features.html">Android <?cs
var:sdk.preview.version ?> Platform Highlights</a> document for a list of
highlights.</p>
<?cs /if ?>
<p>Before downloading, please read the <a href="requirements.html">
System Requirements</a> document. As you start the download, you will also need to review and agree to
the Terms and Conditions that govern the use of the Android SDK. </p>
System Requirements</a> document. As you start the download, you will also need
to review and agree to the Terms and Conditions that govern the use of the
Android SDK. </p>
<table class="download">
<tr>
@ -170,14 +172,17 @@ the Terms and Conditions that govern the use of the Android SDK. </p>
<?cs if:android.whichdoc != "online" && sdk.preview ?>
<p>Welcome developers! The next release of the Android platform will be
Android 1.6 and we are pleased to announce the availability of an early look SDK
to give you a head-start on developing applications for it. </p>
Android <?cs var:sdk.preview.version ?> and we are pleased to announce the
availability of an early look SDK to give you a head-start on developing
applications for it. </p>
<p>The Android 1.6 platform includes a variety of improvements and new features
for users and developers. Additionally, the SDK itself introduces several new
capabilities that enable you to develop applications more efficiently.
See the <a href="http://developer.android.com/sdk/preview/features.html">
Android 1.6 Highlights</a> document for a list of highlights.</p>
<p>The Android <?cs var:sdk.preview.version ?> platform includes a variety of
improvements and new features for users and developers. Additionally, the SDK
itself introduces several new capabilities that enable you to develop
applications more efficiently. See the <a
href="http://developer.android.com/sdk/preview/features.html">Android
<?cs var:sdk.preview.version ?> Highlights</a> document for a list of
highlights.</p>
<?cs /if ?>
<?cs call:tag_list(root.descr) ?>