am 8be9330b: Merge "Docs: Adding Javadoc fix and replacing "latest version" with "master branch""
* commit '8be9330bcbc4b1f6cfaf34812685df7e863232d6':
Docs: Adding Javadoc fix and replacing "latest version" with "master branch"
diff --git a/src/source/building.jd b/src/source/building.jd
index f00be66..8eec5a9 100644
--- a/src/source/building.jd
+++ b/src/source/building.jd
@@ -49,7 +49,7 @@
</li>
<li>
- JDK 7 to build the latest version of Android in the <a
+ JDK 7 to build the master branch of Android in the <a
href="https://android.googlesource.com/">Android Open Source Project
(AOSP)</a>; JDK 6 to build Gingerbread through KitKat; JDK 5 for Cupcake through
Froyo. See <a href="initializing.html">Initializing a Build Environment</a>
diff --git a/src/source/initializing.jd b/src/source/initializing.jd
index 120d92e..a3d0a5f 100644
--- a/src/source/initializing.jd
+++ b/src/source/initializing.jd
@@ -59,7 +59,7 @@
instructions for Ubuntu and MacOS below.</p>
<h3 id="installing-the-jdk">Installing the JDK</h3>
-<p>The latest version of Android in the <a
+<p>The master branch of Android in the <a
href="https://android.googlesource.com/">Android Open Source Project (AOSP)</a>
requires Java 7. On Ubuntu, use <a href="http://openjdk.java.net/install/">OpenJDK</a>.</p>
<p>Java 7: For the latest version of Android</p>
@@ -72,6 +72,10 @@
$ sudo update-alternatives --config javac
</code></pre>
+<p>If you encounter version errors for Java, set its
+path as described in the <a href="building-running.html#wrong-java-version">Wrong
+Java Version</a> section.</p>
+
<p>To develop older versions of Android, download and install the corresponding version of the <a
href="http://www.oracle.com/technetwork/java/javase/archive-139210.html">Java JDK</a>:<br/>
Java 6: for Gingerbread through KitKat<br/>