diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2009-10-22 18:44:32 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2009-10-22 18:44:32 -0700 |
| commit | 8eef2dd94509afa1245d1106ae7feec21be439c4 (patch) | |
| tree | 2e2e7e45ce8482b9449688e1b68b48aac7f4caf0 /docs/html/guide/tutorials | |
| parent | 46b9e216a2492544d0a081d8df57afd33349f36e (diff) | |
| parent | 9b7fb57c6e41662197373888cf47656cb2f3adda (diff) | |
| download | frameworks_base-8eef2dd94509afa1245d1106ae7feec21be439c4.zip frameworks_base-8eef2dd94509afa1245d1106ae7feec21be439c4.tar.gz frameworks_base-8eef2dd94509afa1245d1106ae7feec21be439c4.tar.bz2 | |
Merge commit '9b7fb57c' into manualmerge
Conflicts:
docs/html/sdk/android-1.5.jd
Diffstat (limited to 'docs/html/guide/tutorials')
| -rw-r--r-- | docs/html/guide/tutorials/hello-world.jd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/tutorials/hello-world.jd b/docs/html/guide/tutorials/hello-world.jd index 9be63bd..f6b54ff 100644 --- a/docs/html/guide/tutorials/hello-world.jd +++ b/docs/html/guide/tutorials/hello-world.jd @@ -29,7 +29,7 @@ You can then return to this tutorial and ignore anything about Eclipse.</p> <p>Before you start, you should already have the very latest SDK installed, and if you're using Eclipse, you should have installed the ADT plugin as well. If you have not installed these, see -<a href="{@docRoot}sdk/{@sdkCurrent}/installing.html">Installing the Android SDK</a> and return +<a href="{@docRoot}sdk/installing.html">Installing the Android SDK</a> and return here when you've completed the installation.</p> <h2 id="avd">Create an AVD</h2> |