summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-04-27 11:35:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-27 11:35:12 +0000
commitb6d1d7171dff2d2625ae183e8629d627882fb493 (patch)
treee7b1aa074d25f1c5511c207f6d78d55b1b38d66a /core/java/android/net
parentd8269c0cc8bc82cefa98130b06270d2b5789e3df (diff)
parentcf6fc5ee13e549c6ce1a6a4fc417aa13fc0dfa17 (diff)
downloadframeworks_base-b6d1d7171dff2d2625ae183e8629d627882fb493.zip
frameworks_base-b6d1d7171dff2d2625ae183e8629d627882fb493.tar.gz
frameworks_base-b6d1d7171dff2d2625ae183e8629d627882fb493.tar.bz2
am cf6fc5ee: Merge "Fix incorrect javadoc for Uri.getQueryParameter."
* commit 'cf6fc5ee13e549c6ce1a6a4fc417aa13fc0dfa17': Fix incorrect javadoc for Uri.getQueryParameter.
Diffstat (limited to 'core/java/android/net')
-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