resolved conflicts for merge of 66189de6 to master

Change-Id: Id4a80013dd506bd1135dd931450ee2a08a4c77aa

diff --cc docs/html/sdk/index.jd
Simple merge

diff --cc docs/html/sdk/installing/migrate.jd
index 81d6f92,fbf8d53..696552a
--- 1/docs/html/sdk/installing/migrate.jd
--- 2/docs/html/sdk/installing/migrate.jd
+++ b/docs/html/sdk/installing/migrate.jd
@@@ -14,10 -14,11 +14,10 @@@ page.title=Migrating to Android Studi
  </div>
  </div>
  
- <p>If you're currently using Eclipse with ADT, we recommend you migrate to <a
- href={@docRoot}tools/basics/index.html">Android Studio</a>, a new Android
+ <p>If you're currently using Eclipse with ADT, we recommend you migrate to
+ <a href="{@docRoot}tools/studio/index.html">Android Studio</a>, a new Android
  development environment powered by IntelliJ IDEA. On top of the capabilities you expect from
  IntelliJ, Android Studio offers:</p>
 -
  <ul>
    <li>Flexible Gradle-based build system.</li>
    <li>Build variants and multiple APK generation.</li>

diff --cc docs/html/tools/eclipse/index.jd
Simple merge

diff --cc docs/html/tools/studio/index.jd
Simple merge