tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolved conflicts for merge of 1c4fe5aa to master

Browse source 
Change-Id: I3c83852dfb6a80614aad145d12cd61b65829805f
This commit is contained in:
Scott Main 2010-12-06 16:36:53 -08:00
commit 6ea057563d
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/droiddoc/templates-sdk/sdkpage.cs
View file

@ -134,9 +134,10 @@ do so before downloading the NDK.
<p>Welcome Developers! If you are new to the Android SDK, please read the steps below, for an
overview of how to set up the SDK. </p>
<p>If you are already using the Android SDK and would like to update to the
latest tools or platforms, please use the <em>Android SDK and AVD Manager</em>
to get the components, rather than downloading a new SDK package.</p>
<p>If you're already using the Android SDK, you should
update to the latest tools or platform using the <em>Android SDK and AVD Manager</em>, rather than
downloading a new SDK starter package. See <a
href="<?cs var:toroot ?>sdk/adding-components.html">Adding SDK Components</a>.</p>
<table class="download">
<tr>