resolved conflicts for merge of 45fed517 to mnc-dev

Change-Id: I08e44ee778436e5592e73ced82356f015cbdfe74

diff --cc docs/html/sdk/index.jd
index a352f65,34c04cf..8da052e
--- 1/docs/html/sdk/index.jd
--- 2/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@@ -300,7 -286,8 +286,7 @@@ width: 400px;text-align: center;">The o
  <li>Android 5.0 emulator system image with Google APIs</li>
  </ul>
  
- <a class="online landing-button green download-bundle-button" style="margin-top:30px;"
 -
+ <a class="online landing-button green download-bundle-button"
  href="#Other" >Download Android Studio</a>
  
  <!-- this appears when viewing the offline docs -->