diff options
| author | smain@google.com <smain@google.com> | 2014-12-09 14:19:57 -0800 |
|---|---|---|
| committer | smain@google.com <smain@google.com> | 2014-12-09 14:19:57 -0800 |
| commit | b56db728fa5d411cd253b483382aa5d20eb8475a (patch) | |
| tree | f29ed00c3fe97208ec80365403e72ad7f5896bb5 /docs/html/training/basics/firstapp | |
| parent | 2b08f538d1618b764a952e355b778046da085bde (diff) | |
| parent | c137d08c1ca188f7e1936648cf62bf7329003043 (diff) | |
| download | frameworks_base-b56db728fa5d411cd253b483382aa5d20eb8475a.zip frameworks_base-b56db728fa5d411cd253b483382aa5d20eb8475a.tar.gz frameworks_base-b56db728fa5d411cd253b483382aa5d20eb8475a.tar.bz2 | |
resolved conflicts for merge of c137d08c to master
Change-Id: I1addaa7b46e893014eca23746c6bf5f7e71dc2ca
Diffstat (limited to 'docs/html/training/basics/firstapp')
| -rw-r--r-- | docs/html/training/basics/firstapp/index.jd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/training/basics/firstapp/index.jd b/docs/html/training/basics/firstapp/index.jd index 4dca352..1b6e00f 100644 --- a/docs/html/training/basics/firstapp/index.jd +++ b/docs/html/training/basics/firstapp/index.jd @@ -32,7 +32,7 @@ design, including how to build a simple user interface and handle user input.</p <p>Before you start this class, be sure you have your development environment set up. You need to:</p> <ol> - <li>Download the <a href="{@docRoot}sdk/index.html">Android Studio</a>.</li> + <li>Download <a href="{@docRoot}sdk/index.html">Android Studio</a>.</li> <li>Download the latest SDK tools and platforms using the <a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a>.</li> </ol> |