summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-10-28 04:51:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-28 04:51:18 +0000
commit66636a1da0fb894f403e9a9ebc8508ad6a278565 (patch)
tree0e56e495922b48a2a1aac67b15f5b522ad96e5b3
parent223f4aade32d3af2b491390da8cc4a4367736b19 (diff)
parentab385d6e896e56385ee03bae0b58213a2cb71cae (diff)
downloadlibcore-66636a1da0fb894f403e9a9ebc8508ad6a278565.zip
libcore-66636a1da0fb894f403e9a9ebc8508ad6a278565.tar.gz
libcore-66636a1da0fb894f403e9a9ebc8508ad6a278565.tar.bz2
am ab385d6e: Merge "Fix javadoc links for property related methods."
* commit 'ab385d6e896e56385ee03bae0b58213a2cb71cae': Fix javadoc links for property related methods.
-rw-r--r--luni/src/main/java/java/lang/System.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/luni/src/main/java/java/lang/System.java b/luni/src/main/java/java/lang/System.java
index 68af967..fa90bbb 100644
--- a/luni/src/main/java/java/lang/System.java
+++ b/luni/src/main/java/java/lang/System.java
@@ -895,7 +895,7 @@ public final class System {
/**
* Sets the value of a particular system property. Most system properties
- * are read only and cannot be cleared or modified. See {@link #setProperty} for a
+ * are read only and cannot be cleared or modified. See {@link #getProperty} for a
* list of such properties.
*
* @return the old value of the property or {@code null} if the property
@@ -908,7 +908,7 @@ public final class System {
/**
* Removes a specific system property. Most system properties
- * are read only and cannot be cleared or modified. See {@link #setProperty} for a
+ * are read only and cannot be cleared or modified. See {@link #getProperty} for a
* list of such properties.
*
* @return the property value or {@code null} if the property didn't exist.
@@ -1070,7 +1070,7 @@ public final class System {
/**
* Attempts to set all system properties. Copies all properties from
* {@code p} and discards system properties that are read only and cannot
- * be modified. See {@link #setProperty} for a list of such properties.
+ * be modified. See {@link #getProperty} for a list of such properties.
*/
public static void setProperties(Properties p) {
PropertiesWithNonOverrideableDefaults userProperties =