diff options
| author | smain@google.com <smain@google.com> | 2014-12-09 14:14:11 -0800 |
|---|---|---|
| committer | smain@google.com <smain@google.com> | 2014-12-09 14:14:11 -0800 |
| commit | 2b08f538d1618b764a952e355b778046da085bde (patch) | |
| tree | 6a8244e4a9d598558d1be3dd286231a5a1a1aacb /docs/html | |
| parent | 5f7d05f3e060f441c5a0c38d483b704ecd5d8994 (diff) | |
| parent | 132004f8692d5574c4c60ce739022cdd87925944 (diff) | |
| download | frameworks_base-2b08f538d1618b764a952e355b778046da085bde.zip frameworks_base-2b08f538d1618b764a952e355b778046da085bde.tar.gz frameworks_base-2b08f538d1618b764a952e355b778046da085bde.tar.bz2 | |
resolved conflicts for merge of 132004f8 to master
Change-Id: I35c6ef810daf2b1329c46798fe6c7e6f2c1dfc82
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/sdk/index.jd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index 3a30cb8..b1b76df 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -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> |