resolved conflicts for merge of ef7708f8 to master

<!-- ################    STUDIO    ##################### -->

<div id="studio" heading="Installing Android Studio" style="display:none">

<p>Android Studio provides the tools you need to start developing apps, including

the Android Studio IDE (powered by IntelliJ) and guides you to install

the Android SDK tools to streamline your Android app development.</p>

<p>Android Studio provides everything you need to start developing apps for Android, including

the Android Studio IDE and the Android SDK tools.</p>

<p>If you didn't download Android Studio, go <a href="{@docRoot}sdk/index.html"

><b>download Android Studio now</b></a>, or switch to the

<p>Before you set up Android Studio, be sure you have installed

JDK 6 or greater (the JRE alone is not sufficient). To check if you

JDK 6 or higher (the JRE alone is not sufficient)—JDK 7 is required when

developing for Android 5.0 and higher. To check if you

have JDK installed (and which version), open a terminal and type <code>javac -version</code>.

If the JDK is not available or the version is lower than 6,

<a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html" class="external-link"

  <ol>

    <li>Unzip the file, {@code android-studio-ide-&lt;version&gt;-windows.zip} and launch the

        <code>studio.exe</code> file.</li>

    <li>Follow the setup wizard to install Android Studio and the SDK Tools.

    <li>Follow the setup wizard to install Android Studio and any necessary SDK tools.

    <p>On some Windows systems, the launcher script does not find where Java is installed.

      If you encounter this problem,

  <ol>

    <li>Unzip the downloaded zip file, {@code android-studio-ide-&lt;version&gt;-mac.zip}.</li>

    <li>Drag and drop Android Studio into the Applications folder.

    <li>Open Android Studio and follow the setup wizard to install any necessary SDK tools.

      <p>

      Depending on your security settings, when you attempt to open Android Studio, you might

      see a warning that says the package is damaged and should be moved to the trash. If this

      <p>You may want to add {@code android-studio/bin/} to your PATH environmental

      variable so that you can start Android Studio from any directory.</p>

    </li>

    <li>Follow the links to install the SDK outside of the Android Studio directories.</li>

    <li>Follow the setup wizard to install any necessary SDK tools.</li>

  </ol>

</div><!-- end linux -->

      <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/JavaInstallation</a></li>

    </ul>

  </li>

  <li>Here are the steps to install Java and Eclipse, prior to installing

  the Android SDK and ADT Plugin.

  <li>Here are the steps to install Java:

    <ol>

      <li><p>If you are running a 64-bit distribution on your development

      machine, you need to install additional packages first. For Ubuntu 13.10 (Saucy Salamander)

      <pre class="no-pretty-print">apt-get install ia32-libs</pre>

      </li>

      <li>Next, install Java: <pre class="no-pretty-print">apt-get install sun-java6-jdk</pre></li>

      <li>The Ubuntu package manager does not currently offer an Eclipse 3.7

      version for download, so we recommend that you download Eclipse from

      eclipse.org (<a

      href="http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/</a>).

      A Java or RCP version of Eclipse is recommended.</li>

      <li>Follow the steps given in previous sections to install the SDK

      and the ADT plugin. </li>

    </ol>

  </li>

</ul>

  // Show the SDK Tools (other IDE) instructions

  $("h1").text($("#tools").attr('heading'));

  $("#tools").show();

} else if (package == "adt") {

  // Show the ADT instructions

  $("h1").text($("#adt").attr('heading'));

  $("#adt").show();

} else if (package == "studio") {

  // Show the Android Studio instructions

  $("h1").text($("#studio").attr('heading'));