am ea05f82a: Merge "Fix obsolete javadoc." into lmp-sprout-dev

* commit 'ea05f82ae3b260364a80815d5d6547785e1d7618':
  Fix obsolete javadoc.

1 files changed, 3 insertions, 4 deletions

diff --git a/luni/src/main/java/java/lang/System.java b/luni/src/main/java/java/lang/System.java
index 68af967..55ca762 100644
--- a/luni/src/main/java/java/lang/System.java
+++ b/luni/src/main/java/java/lang/System.java
@@ -830,8 +830,7 @@ public final class System {
      * Returns the value of a particular system property or {@code null} if no
      * such property exists.
      *
-     * <p>The following properties are always provided by the Dalvik VM <b>and
-     * cannot be modified</b>:
+     * <p>The following properties are always provided by the Dalvik VM:</p>
      * <p><table BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
      * <tr BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
      *     <td><b>Name</b></td>        <td><b>Meaning</b></td>                    <td><b>Example</b></td></tr>
@@ -872,8 +871,8 @@ public final class System {
      *
      * </table>
      *
-     * <p>It is an error to override anyone of these properties. Any attempt to
-     * do so will leave their values unchanged.
+     * <p> All of the above properties except for {@code user.home} and {@code java.io.tmpdir}
+     * <b>cannot be modified</b>. Any attempt to change them will be a no-op.
      *
      * @param propertyName
      *            the name of the system property to look up.