summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2012-05-10 12:39:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-10 12:39:37 -0700
commit822b72efd8795abe72b95d0ddd45873a5c4b77f8 (patch)
tree3cb88665a348bf1d39395d06db2072e2b6492bea /api
parenta1dc761c8322355eb1bb71d3d6c9c603c1d1fc0f (diff)
parentabc43ddd8ae098de7a56afc55909f904cd933016 (diff)
downloadframeworks_base-822b72efd8795abe72b95d0ddd45873a5c4b77f8.zip
frameworks_base-822b72efd8795abe72b95d0ddd45873a5c4b77f8.tar.gz
frameworks_base-822b72efd8795abe72b95d0ddd45873a5c4b77f8.tar.bz2
Merge "Rename Uri.normalize() to Uri.normalizeScheme()." into jb-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index c909ba0..ffe994e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12487,7 +12487,7 @@ package android.net {
method public abstract boolean isHierarchical();
method public boolean isOpaque();
method public abstract boolean isRelative();
- method public android.net.Uri normalize();
+ method public android.net.Uri normalizeScheme();
method public static android.net.Uri parse(java.lang.String);
method public abstract java.lang.String toString();
method public static android.net.Uri withAppendedPath(android.net.Uri, java.lang.String);