summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-04-30 11:25:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-30 11:25:37 +0000
commit144b0bb6053010f0e0da65cee89401b87633bbff (patch)
treea814386d7d4a99f7b8a27599b1da973c7d7d2ed4 /core/java/android
parent780a9b9e12228402144f5c88917875c9da226cbf (diff)
parentb0f3d9ea6e26ab329b6c25906bb6252555457e1c (diff)
downloadframeworks_base-144b0bb6053010f0e0da65cee89401b87633bbff.zip
frameworks_base-144b0bb6053010f0e0da65cee89401b87633bbff.tar.gz
frameworks_base-144b0bb6053010f0e0da65cee89401b87633bbff.tar.bz2
Merge "Fix incorrect javadoc for Uri.getQueryParameter." into mnc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/Uri.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java
index f305b2a..4a8dfbc 100644
--- a/core/java/android/net/Uri.java
+++ b/core/java/android/net/Uri.java
@@ -1657,7 +1657,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
/**
* Searches the query string for the first value with the given key.
*
- * <p><strong>Warning:</strong> Prior to Ice Cream Sandwich, this decoded
+ * <p><strong>Warning:</strong> Prior to Jelly Bean, this decoded
* the '+' character as '+' rather than ' '.
*
* @param key which will be encoded