resolved conflicts for merge of 132004f8 to master (2b08f538) · Commits · e / os / android_frameworks_base

docs/html/sdk/index.jd

+1 −1

Original line number	Diff line number	Diff line
		@@ -309,7 +309,7 @@ href="http://developer.android.com/sdk/index.html">developer.android.com/sdk/</a
		<ul style="margin-top:50px;color:#444">
		<li><a href="#Requirements">System Requirements</a></li>
		<li><a href="#Other">Other Download Options</a></li>
		<li><a href="{@docRoot}sdk/installing/migrate.html">Migrate from Eclipse</a></li>
		<li><a href="{@docRoot}sdk/installing/migrate.html">Migrating to Android Studio</a></li>
		</ul>

		</div>