Merge "Track libcore change b695412b529c8dced105867c6d9d7fd463a67714"
diff --git a/api/current.txt b/api/current.txt
index 8744ac9..2a09d81 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -56347,6 +56347,15 @@
method public synchronized int search(java.lang.Object);
}
+ public final class StringJoiner {
+ ctor public StringJoiner(java.lang.CharSequence);
+ ctor public StringJoiner(java.lang.CharSequence, java.lang.CharSequence, java.lang.CharSequence);
+ method public java.util.StringJoiner add(java.lang.CharSequence);
+ method public int length();
+ method public java.util.StringJoiner merge(java.util.StringJoiner);
+ method public java.util.StringJoiner setEmptyValue(java.lang.CharSequence);
+ }
+
public class StringTokenizer implements java.util.Enumeration {
ctor public StringTokenizer(java.lang.String, java.lang.String, boolean);
ctor public StringTokenizer(java.lang.String, java.lang.String);
diff --git a/api/system-current.txt b/api/system-current.txt
index d745410..5dc6cae 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -58965,6 +58965,15 @@
method public synchronized int search(java.lang.Object);
}
+ public final class StringJoiner {
+ ctor public StringJoiner(java.lang.CharSequence);
+ ctor public StringJoiner(java.lang.CharSequence, java.lang.CharSequence, java.lang.CharSequence);
+ method public java.util.StringJoiner add(java.lang.CharSequence);
+ method public int length();
+ method public java.util.StringJoiner merge(java.util.StringJoiner);
+ method public java.util.StringJoiner setEmptyValue(java.lang.CharSequence);
+ }
+
public class StringTokenizer implements java.util.Enumeration {
ctor public StringTokenizer(java.lang.String, java.lang.String, boolean);
ctor public StringTokenizer(java.lang.String, java.lang.String);