Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of dda0cb9f to master

Browse Source 
Change-Id: Id649a91b403f0b6c077ada1c11495657ddc6d181
This commit is contained in:
Joe Fernandez
2014-12-09 12:12:24 -08:00
parent 3bf22c31e8 dda0cb9fc5
commit f0256aba1f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/html/sdk/installing/index.jd
View File

@@ -113,7 +113,7 @@ where they are installed. For example:</p>
<p><b>To set up Android Studio on Linux:</b></p>
<ol>
<li>Unpack the downloaded Tar file, {@code android-studio-ide-&lt;version&gt;-linux.zip}, into an
<li>Unpack the downloaded Tar file, {@code android-studio-ide-&lt;version&gt;-linux.zip}, into an
appropriate location for your applications.
<li>To launch Android Studio, navigate to the {@code android-studio/bin/} directory
in a terminal and execute {@code studio.sh}.
@@ -208,7 +208,7 @@ the SDK tools from the command line.</p>
<p><b>To get started on Linux:</b></p>
<p>Unpack the {@code .zip} file you've downloaded. The SDK files are download separately to a
<p>Unpack the {@code .zip} file you've downloaded. The SDK files are download separately to a
user-specified directory. </p>
<p>Make a note of the name and location of the SDK directory on your system&mdash;you will need to
@@ -328,7 +328,8 @@ Continue: Adding SDK Packages</a></p>
<div id="default" style="display:none">
<p>If you haven't already, <b><a href="{@docRoot}sdk/index.html">download
the Android SDK bundle for Android Studio or the stand-alone SDK Tools</a></b>. </p>
the Android SDK bundle for Android Studio</a></b> or the
<a href="{@docRoot}sdk/index.html#Other">stand-alone SDK Tools</a>. </p>
<p>Then, select which SDK bundle you want to install:</p>