diff options
| author | Scott Main <smain@google.com> | 2010-12-06 16:36:53 -0800 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2010-12-06 16:36:53 -0800 |
| commit | 6ea057563d1b5599db4281b87ec8916508ad623b (patch) | |
| tree | 2e5f6314cfa3f0f0275454508ad3cce8db3a77ca /tools | |
| parent | 1cf9e0ef16fe5033c4ec423861ce459f283237a0 (diff) | |
| parent | 1c4fe5aaff199a8d474684f919cec8ae24914040 (diff) | |
| download | build-6ea057563d1b5599db4281b87ec8916508ad623b.zip build-6ea057563d1b5599db4281b87ec8916508ad623b.tar.gz build-6ea057563d1b5599db4281b87ec8916508ad623b.tar.bz2 | |
resolved conflicts for merge of 1c4fe5aa to master
Change-Id: I3c83852dfb6a80614aad145d12cd61b65829805f
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/droiddoc/templates-sdk/sdkpage.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs index 4982638..298e882 100644 --- a/tools/droiddoc/templates-sdk/sdkpage.cs +++ b/tools/droiddoc/templates-sdk/sdkpage.cs @@ -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> |