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

resolved conflicts for merge of 132004f8 to master

Browse Source 
Change-Id: I35c6ef810daf2b1329c46798fe6c7e6f2c1dfc82
This commit is contained in:
smain@google.com
2014-12-09 14:14:11 -08:00
parent 5f7d05f3e0 132004f869
commit 2b08f538d1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/html/sdk/index.jd
View File

@@ -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>