commit c0d71fa38a7847f29f0ed5b97f7415d3da74dff0
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 12 11:20:05 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 12 11:20:06 2017 +0000
tree a7457e61ea63ee4eda0dde74a629c0f8278737ed
parent f9f5cf9d9b60d850ef66dc10e242b766d13dec65
parent fb864ff0f9fc74cec1516a3a95106840bdceac4f

Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 2539699..f1058bf 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -62752,10 +62752,12 @@
     method public java.lang.StringBuffer appendTail(java.lang.StringBuffer);
     method public int end();
     method public int end(int);
+    method public int end(java.lang.String);
     method public boolean find();
     method public boolean find(int);
     method public java.lang.String group();
     method public java.lang.String group(int);
+    method public java.lang.String group(java.lang.String);
     method public int groupCount();
     method public boolean hasAnchoringBounds();
     method public boolean hasTransparentBounds();
@@ -62774,6 +62776,7 @@
     method public java.util.regex.Matcher reset(java.lang.CharSequence);
     method public int start();
     method public int start(int) throws java.lang.IllegalStateException;
+    method public int start(java.lang.String);
     method public java.util.regex.MatchResult toMatchResult();
     method public java.util.regex.Matcher useAnchoringBounds(boolean);
     method public java.util.regex.Matcher usePattern(java.util.regex.Pattern);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index ca02f17..96b8f1e 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -66350,10 +66350,12 @@
     method public java.lang.StringBuffer appendTail(java.lang.StringBuffer);
     method public int end();
     method public int end(int);
+    method public int end(java.lang.String);
     method public boolean find();
     method public boolean find(int);
     method public java.lang.String group();
     method public java.lang.String group(int);
+    method public java.lang.String group(java.lang.String);
     method public int groupCount();
     method public boolean hasAnchoringBounds();
     method public boolean hasTransparentBounds();
@@ -66372,6 +66374,7 @@
     method public java.util.regex.Matcher reset(java.lang.CharSequence);
     method public int start();
     method public int start(int) throws java.lang.IllegalStateException;
+    method public int start(java.lang.String);
     method public java.util.regex.MatchResult toMatchResult();
     method public java.util.regex.Matcher useAnchoringBounds(boolean);
     method public java.util.regex.Matcher usePattern(java.util.regex.Pattern);

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 490d499..a26672a 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -62843,10 +62843,12 @@
     method public java.lang.StringBuffer appendTail(java.lang.StringBuffer);
     method public int end();
     method public int end(int);
+    method public int end(java.lang.String);
     method public boolean find();
     method public boolean find(int);
     method public java.lang.String group();
     method public java.lang.String group(int);
+    method public java.lang.String group(java.lang.String);
     method public int groupCount();
     method public boolean hasAnchoringBounds();
     method public boolean hasTransparentBounds();
@@ -62865,6 +62867,7 @@
     method public java.util.regex.Matcher reset(java.lang.CharSequence);
     method public int start();
     method public int start(int) throws java.lang.IllegalStateException;
+    method public int start(java.lang.String);
     method public java.util.regex.MatchResult toMatchResult();
     method public java.util.regex.Matcher useAnchoringBounds(boolean);
     method public java.util.regex.Matcher usePattern(java.util.regex.Pattern);