summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2013-06-14 16:27:37 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-06-14 16:27:37 -0700
commit0e3e249ddbac1567d392379b8fb75f528f8f2c7e (patch)
tree8c70301173ec59be3fdc790013908effc80664ee
parent214816da8ebfae411610c8f9ec4c4285b8f6f359 (diff)
parent96fefaa23bf95ae6736df90f018cb8c86cb943c3 (diff)
am 96fefaa2: am b87e6138: am 618ed234: Merge "Track nio API change."
* commit '96fefaa23bf95ae6736df90f018cb8c86cb943c3': Track nio API change.
-rw-r--r--api/current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index d4144a88fa53..7484e704a478 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -35844,7 +35844,7 @@ package java.nio {
method public java.nio.CharBuffer put(java.lang.String, int, int);
method public int read(java.nio.CharBuffer) throws java.io.IOException;
method public abstract java.nio.CharBuffer slice();
- method public abstract java.lang.CharSequence subSequence(int, int);
+ method public abstract java.nio.CharBuffer subSequence(int, int);
method public static java.nio.CharBuffer wrap(char[]);
method public static java.nio.CharBuffer wrap(char[], int, int);
method public static java.nio.CharBuffer wrap(java.lang.CharSequence);