am 5238c5f9: fix the build. will revisit this change in a minute

Merge commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c'

* commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c':
  fix the build.  will revisit this change in a minute

1 files changed, 15 insertions, 15 deletions

diff --git a/api/current.xml b/api/current.xml
index 8549080621dc..ab4d72cc513d 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -104972,7 +104972,7 @@
  type="android.net.SSLCertificateSocketFactory"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="public"
 >
 <parameter name="handshakeTimeoutMillis" type="int">
@@ -107109,7 +107109,7 @@
  type="android.net.http.SslCertificate"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="public"
 >
 <parameter name="issuedTo" type="java.lang.String">
@@ -107176,7 +107176,7 @@
  synchronized="false"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="public"
 >
 </method>
@@ -107198,7 +107198,7 @@
  synchronized="false"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="public"
 >
 </method>
@@ -182028,7 +182028,7 @@
  abstract="false"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="public"
 >
 <constructor name="EventLogTags"
@@ -213651,7 +213651,7 @@
  synchronized="true"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="public"
 >
 </method>
@@ -214199,7 +214199,7 @@
  synchronized="true"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="public"
 >
 <parameter name="flag" type="boolean">
@@ -216401,7 +216401,7 @@
  synchronized="false"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="public"
 >
 <parameter name="view" type="android.webkit.WebView">
@@ -416825,7 +416825,7 @@
  synchronized="false"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="protected"
 >
 <parameter name="pattern" type="java.lang.String">
@@ -424206,7 +424206,7 @@
  abstract="true"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="public"
 >
 <method name="getLength"
@@ -424695,7 +424695,7 @@
  abstract="true"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="public"
 >
 <method name="characters"
@@ -424910,7 +424910,7 @@
  abstract="false"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="public"
 >
 <implements name="org.xml.sax.DTDHandler">
@@ -425377,7 +425377,7 @@
  abstract="true"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="public"
 >
 <method name="parse"
@@ -426809,7 +426809,7 @@
  abstract="false"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="public"
 >
 <implements name="org.xml.sax.AttributeList">
@@ -428298,7 +428298,7 @@
  abstract="false"
  static="false"
  final="false"
- deprecated="deprecated"
+ deprecated="not deprecated"
  visibility="public"
 >
 <method name="makeParser"