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

Commit 5a93032d authored by Dirk Dougherty's avatar Dirk Dougherty
Browse files

doc change: resolved conflicts for merge of 3c691a8d to gingerbread 

Conflicts:
	docs/html/sdk/android-2.2.jd

Change-Id: I58f9503db8692df15dba1277a46e4c6eb338b438
parents b1008010 3c691a8d

docs/html/sdk/android-1.5.jd

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ function toggleDiv(link) { 


<div class="toggleable closed">

  <a href="#" onclick="return toggleDiv(this)">

        <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" />

        <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" width="9px" />

        Android 1.5, Revision 3</a> <em>(July 2009)</em></a>

  <div class="toggleme">

<dl>

docs/html/sdk/android-1.6.jd

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ function toggleDiv(link) { 


<div class="toggleable closed">

  <a href="#" onclick="return toggleDiv(this)">

        <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" />

        <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" width="9px" />

        Android 1.6, Revision 2</a> <em>(December 2009)</em></a>

  <div class="toggleme">

<dl>

docs/html/sdk/android-2.1.jd

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ function toggleDiv(link) { 


<div class="toggleable closed">

  <a href="#" onclick="return toggleDiv(this)">

        <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" />

        <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" width="9px" />

        Android 2.1, Revision 1</a> <em>(January 2010)</em></a>

  <div class="toggleme">

<dl>

docs/html/sdk/android-2.2.jd

+25 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ page.title=Android 2.2 Platform 
sdk.platform.version=2.2

sdk.platform.apiLevel=8

sdk.platform.majorMinor=minor

sdk.platform.deployableDate=May 2010



@jd:body
@@ -118,6 +117,30 @@ function toggleDiv(link) { 
<div class="toggleable opened">

  <a href="#" onclick="return toggleDiv(this)">

        <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" />

        Android {@sdkPlatformVersion}, Revision 2</a> <em>(July 2010)</em></a>

  <div class="toggleme">

<dl>

<dt>Dependencies:</dt>

<dd>

<p>Requires SDK Tools r6 or higher.</p>

</dd>



<dt>System Image:</dt>

<dd>

<ul>

<li>Adds default Search Widget.</li>

<li>Includes proper provisioning for the platform's Backup Manager. For more information about how to use the Backup Manager, see <a href="{@docRoot}guide/topics/data/backup.html">Data Backup</a>.</li>

<li>Updates the Android 2.2 system image to FRF91.</li>

</ul>

</dd>



</dl>

 </div>

</div>



<div class="toggleable closed">

  <a href="#" onclick="return toggleDiv(this)">

        <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" width="9px" />

        Android {@sdkPlatformVersion}, Revision 1</a> <em>(May 2010)</em></a>

  <div class="toggleme">

<dl>
@@ -135,7 +158,6 @@ function toggleDiv(link) { 
 </div>

</div>





<h2 id="api-level">API Level</h2>



<p>The Android {@sdkPlatformVersion} platform delivers an updated version of

docs/html/sdk/ndk/index.jd

+18 −11
Original line number Diff line number Diff line 
ndk=true



ndk.win_download=android-ndk-r4-windows.zip

ndk.win_bytes=45778965

ndk.win_checksum=1eded98a7f5cd5e71f8ac74565f73f11

ndk.win_download=android-ndk-r4b-windows.zip

ndk.win_bytes=45792835

ndk.win_checksum=e397145e155a639be53ee4b6db8ad511



ndk.mac_download=android-ndk-r4-darwin-x86.zip

ndk.mac_bytes=50572163

ndk.mac_checksum=b7d5f149fecf951c05a79b045f00419f

ndk.mac_download=android-ndk-r4b-darwin-x86.zip

ndk.mac_bytes=50586041

ndk.mac_checksum=41dbd54335fb828ee408eab17103a1b0



ndk.linux_download=android-ndk-r4-linux-x86.zip

ndk.linux_bytes=49450682

ndk.linux_checksum=0892b0637d45d145e045cc68e163dee3

ndk.linux_download=android-ndk-r4b-linux-x86.zip

ndk.linux_bytes=49464776

ndk.linux_checksum=2deabcb125c219b34140975b710f00ec



page.title=Android NDK

@jd:body
@@ -62,8 +62,15 @@ padding: .25em 1em; 
<div class="toggleable open">

  <a href="#" onclick="return toggleDiv(this)">

        <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" />

Android NDK, Revision 4</a> <em>(May 2010)</em>

Android NDK, Revision 4b</a> <em>(June 2010)</em>

  <div class="toggleme">

<dl>

<dt>NDK r4b notes:</dt>

<dd><p>Includes fixes for several issues in the NDK build and debugging scripts

&mdash; if you are using NDK r4, we recommend downloading the NDK r4b build. For

detailed information the changes in this release, read the CHANGES.TXT document

included in the downloaded NDK package.</p></dd>

</dl>



<dl>

<dt>General notes:</dt>
@@ -114,7 +121,7 @@ code.</li> 


<div class="toggleable closed">

  <a href="#" onclick="return toggleDiv(this)">

        <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" />

        <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" width="9px" />

Android NDK, Revision 3</a> <em>(March 2010)</em>

  <div class="toggleme">