merge from open-source master

Change-Id: I8a67eacfb33430d61d738b588955148b2f11994c
This commit is contained in:
The Android Open Source Project
2010-07-09 14:42:33 -07:00
2 changed files with 5 additions and 6 deletions

View File

@@ -11,7 +11,7 @@ Make sure that you are using the right version of java
If that doesn't work, go through the instructions on If that doesn't work, go through the instructions on
http://source.android.com/download again. http://source.android.com/source/download.html again.
2) from the root 2) from the root

View File

@@ -288,14 +288,13 @@ Google I/O videos:
Getting started with the Android source code: Getting started with the Android source code:
<ul> <ul>
<li><a href="http://source.android.com/download">Get source</a></li> <li><a href="http://source.android.com/source/download.html">Get source</a></li>
<li><a href="http://source.android.com/submit-patches/code-style-guide">Code Style Guide</a></li> <li><a href="http://source.android.com/source/code-style.html">Code Style Guide</a></li>
</ul> </ul>
Repo and Git resources: Repo and Git resources:
<ul> <ul>
<li><a href="http://source.android.com/download/using-repo#TOC-Git-and-Repo-cheatsheet">Git and Repo cheat sheet</a></li> <li><a href="http://source.android.com/source/git-repo.html">Using Repo and Git</a></li>
<li><a href="http://source.android.com/download/using-repo">Using Repo and Git</a></li>
<li>The <a href="http://book.git-scm.com/">Git Community Book</a> maintained by Scott Chacon</li> <li>The <a href="http://book.git-scm.com/">Git Community Book</a> maintained by Scott Chacon</li>
<li><a href="http://git.or.cz/gitwiki/FrontPage">GitWiki</a></li> <li><a href="http://git.or.cz/gitwiki/FrontPage">GitWiki</a></li>
<li><a href="http://www.kernel.org/pub/software/scm/git/docs/">Git Manual Page</a></li> <li><a href="http://www.kernel.org/pub/software/scm/git/docs/">Git Manual Page</a></li>
@@ -304,7 +303,7 @@ Repo and Git resources:
Documentation on specific tasks: Documentation on specific tasks:
<ul> <ul>
<li><a href="http://source.android.com/documentation/building-for-dream">Building for an Android Developer Phone</a></li> <li><a href="http://source.android.com/source/building-dream.html">Building for an Android Developer Phone</a></li>
</ul> </ul>
--> -->