Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cc32e3f authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge commit 'remotes/goog/donut' into donut-release

parents 3a5013d9 4d545a82
Loading
Loading
Loading
Loading
+21 −16
Original line number Diff line number Diff line
@@ -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>
  <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>

  <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>
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 <?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) ?>