Update android annotations. Do not add jdk annotations for android sdk

android-sdk-annotations/org/apache/harmony/security/annotations.xml

@@ -5,22 +5,19 @@
     <item name='org.apache.harmony.security.SystemScope java.security.Identity getIdentity(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.PrivateKeyImpl byte[] getEncoded()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.PublicKeyImpl byte[] getEncoded()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.PrivateKeyImpl void setEncoding(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.PrivateKeyImpl java.lang.String getFormat()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.PublicKeyImpl java.lang.String getFormat()'>
+    <item name='org.apache.harmony.security.SystemScope java.util.Enumeration identities()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.SystemScope java.util.Enumeration identities()'>
+    <item name='org.apache.harmony.security.PrivateKeyImpl void setEncoding(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.PrivateKeyImpl byte[] getEncoded()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.PublicKeyImpl void setEncoding(byte[]) 0'>
@@ -29,4 +26,7 @@
     <item name='org.apache.harmony.security.SystemScope void removeIdentity(java.security.Identity) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.PublicKeyImpl java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>

android-sdk-annotations/org/apache/harmony/security/asn1/annotations.xml

@@ -20,9 +20,15 @@
     <item name='org.apache.harmony.security.asn1.ASN1Implicit java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Integer org.apache.harmony.security.asn1.ASN1Integer getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1SequenceOf void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Any java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.DerOutputStream void encodeSequence(org.apache.harmony.security.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -32,6 +38,9 @@
     <item name='org.apache.harmony.security.asn1.ASN1Implicit void encodeASN(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1TypeCollection OPTIONAL'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.BerOutputStream void getSequenceLength(org.apache.harmony.security.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -41,9 +50,6 @@
     <item name='org.apache.harmony.security.asn1.ASN1BitString java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Any org.apache.harmony.security.asn1.ASN1Any getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Integer void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -53,10 +59,16 @@
     <item name='org.apache.harmony.security.asn1.ASN1Any void encodeASN(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Boolean org.apache.harmony.security.asn1.ASN1Boolean getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Integer java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1BitString java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+    <item name='org.apache.harmony.security.asn1.ASN1StringType UTF8STRING'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.BerInputStream byte[] getEncoded()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Any int getEncodedLength(org.apache.harmony.security.asn1.BerOutputStream) 0'>
@@ -65,15 +77,15 @@
     <item name='org.apache.harmony.security.asn1.ASN1Choice ASN1Choice(org.apache.harmony.security.asn1.ASN1Type[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1BitString org.apache.harmony.security.asn1.ASN1BitString getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Oid void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Boolean java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Integer org.apache.harmony.security.asn1.ASN1Integer getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Enumerated void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -83,19 +95,13 @@
     <item name='org.apache.harmony.security.asn1.ASN1Implicit void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Oid org.apache.harmony.security.asn1.ASN1Oid getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1SequenceOf void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Set void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Boolean java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.asn1.ASN1GeneralizedTime org.apache.harmony.security.asn1.ASN1GeneralizedTime getInstance()'>
+    <item name='org.apache.harmony.security.asn1.ASN1Oid org.apache.harmony.security.asn1.ASN1Oid getInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ObjectIdentifier void validate(int[]) 0'>
@@ -119,7 +125,10 @@
     <item name='org.apache.harmony.security.asn1.DerOutputStream void getChoiceLength(org.apache.harmony.security.asn1.ASN1Choice) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Any java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+    <item name='org.apache.harmony.security.asn1.ASN1Explicit java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1BitString java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1OctetString void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
@@ -137,36 +146,54 @@
     <item name='org.apache.harmony.security.asn1.ASN1Enumerated void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1StringType java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+    <item name='org.apache.harmony.security.asn1.ASN1Enumerated java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Type java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1UTCTime org.apache.harmony.security.asn1.ASN1UTCTime getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1StringType GENERALSTRING'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.BerInputStream int getLength(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Type java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Choice type'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Integer java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1UTCTime void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Enumerated java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Oid java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+    <item name='org.apache.harmony.security.asn1.ASN1StringType TELETEXSTRING'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Oid org.apache.harmony.security.asn1.ASN1Oid getInstanceForString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Sequence void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Type java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1TypeCollection ASN1TypeCollection(int, org.apache.harmony.security.asn1.ASN1Type[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Type void verify(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1TypeCollection type'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Integer void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -185,9 +212,15 @@
     <item name='org.apache.harmony.security.asn1.ASN1Any void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1OctetString org.apache.harmony.security.asn1.ASN1OctetString getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1StringType void encodeASN(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1StringType BMPSTRING'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1BitString void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -209,55 +242,52 @@
     <item name='org.apache.harmony.security.asn1.BitString BitString(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ObjectIdentifier java.lang.String toString(int[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Type java.lang.Object decode(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1OctetString org.apache.harmony.security.asn1.ASN1OctetString getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.DerInputStream void readSetOf(org.apache.harmony.security.asn1.ASN1SetOf) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1TypeCollection DEFAULT'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Sequence ASN1Sequence(org.apache.harmony.security.asn1.ASN1Type[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.BitString bytes'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.BerInputStream void readSequence(org.apache.harmony.security.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.DerOutputStream DerOutputStream(org.apache.harmony.security.asn1.ASN1Type, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Integer java.lang.Object fromIntValue(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Explicit void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
+    <item name='org.apache.harmony.security.asn1.ASN1Type java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1StringType void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Explicit void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.DerOutputStream void getSequenceOfLength(org.apache.harmony.security.asn1.ASN1SequenceOf) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.BerOutputStream void encodeSequence(org.apache.harmony.security.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.BerInputStream byte[] getEncoded()'>
+    <item name='org.apache.harmony.security.asn1.ASN1OctetString java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1TypeCollection void getValues(java.lang.Object, java.lang.Object[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Type java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Oid void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Enumerated org.apache.harmony.security.asn1.ASN1Enumerated getInstance()'>
+    <item name='org.apache.harmony.security.asn1.ASN1Oid java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ObjectIdentifier java.lang.String toString(int[]) 0'>
@@ -266,9 +296,6 @@
     <item name='org.apache.harmony.security.asn1.ASN1BitString void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1BitString org.apache.harmony.security.asn1.ASN1BitString getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1BitString java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -281,13 +308,16 @@
     <item name='org.apache.harmony.security.asn1.ASN1Choice void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Integer java.math.BigInteger toBigIntegerValue(java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.DerInputStream void readSequence(org.apache.harmony.security.asn1.ASN1Sequence) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.DerOutputStream void encodeExplicit(org.apache.harmony.security.asn1.ASN1Explicit) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1UTCTime org.apache.harmony.security.asn1.ASN1UTCTime getInstance()'>
+    <item name='org.apache.harmony.security.asn1.BitString boolean[] toBooleanArray()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.BerInputStream BerInputStream(byte[]) 0'>
@@ -296,9 +326,6 @@
     <item name='org.apache.harmony.security.asn1.ASN1Set void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Oid org.apache.harmony.security.asn1.ASN1Oid getInstanceForString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1TypeCollection void getValues(java.lang.Object, java.lang.Object[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -308,15 +335,21 @@
     <item name='org.apache.harmony.security.asn1.ASN1Implicit ASN1Implicit(int, org.apache.harmony.security.asn1.ASN1Type) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Explicit java.lang.String toString()'>
+    <item name='org.apache.harmony.security.asn1.ASN1StringType UNIVERSALSTRING'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.BitString boolean[] toBooleanArray()'>
+    <item name='org.apache.harmony.security.asn1.ASN1GeneralizedTime org.apache.harmony.security.asn1.ASN1GeneralizedTime getInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Set ASN1Set(org.apache.harmony.security.asn1.ASN1Type[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1StringType PRINTABLESTRING'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Boolean java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.DerInputStream DerInputStream(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -326,16 +359,13 @@
     <item name='org.apache.harmony.security.asn1.BerOutputStream void encodeExplicit(org.apache.harmony.security.asn1.ASN1Explicit) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1BitString.ASN1NamedBitList java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Integer java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1SetOf void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Enumerated java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+    <item name='org.apache.harmony.security.asn1.ASN1StringType IA5STRING'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Enumerated org.apache.harmony.security.asn1.ASN1Enumerated getInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1Choice java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
@@ -347,10 +377,10 @@
     <item name='org.apache.harmony.security.asn1.ASN1Type void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1GeneralizedTime java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
+    <item name='org.apache.harmony.security.asn1.ASN1Integer java.lang.Object fromIntValue(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Integer java.math.BigInteger toBigIntegerValue(java.lang.Object)'>
+    <item name='org.apache.harmony.security.asn1.ASN1GeneralizedTime java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1UTCTime java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
@@ -362,9 +392,6 @@
     <item name='org.apache.harmony.security.asn1.ASN1Boolean java.lang.Object decode(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1OctetString java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1OctetString void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -374,6 +401,12 @@
     <item name='org.apache.harmony.security.asn1.BerOutputStream void getChoiceLength(org.apache.harmony.security.asn1.ASN1Choice) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1StringType java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Any org.apache.harmony.security.asn1.ASN1Any getInstance()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.DerOutputStream void getSetOfLength(org.apache.harmony.security.asn1.ASN1SetOf) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -383,9 +416,6 @@
     <item name='org.apache.harmony.security.asn1.BerOutputStream void getExplicitLength(org.apache.harmony.security.asn1.ASN1Explicit) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Boolean org.apache.harmony.security.asn1.ASN1Boolean getInstance()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.asn1.ASN1StringType java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -404,6 +434,9 @@
     <item name='org.apache.harmony.security.asn1.ASN1Time java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1BitString.ASN1NamedBitList java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.ASN1Explicit void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -428,12 +461,15 @@
     <item name='org.apache.harmony.security.asn1.ASN1Boolean void encodeContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.asn1.ASN1Enumerated java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
+    <item name='org.apache.harmony.security.asn1.ObjectIdentifier java.lang.String toString(int[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.asn1.ASN1StringType void setEncodingContent(org.apache.harmony.security.asn1.BerOutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.asn1.ASN1Enumerated java.lang.Object getDecodedObject(org.apache.harmony.security.asn1.BerInputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.asn1.BerInputStream void readString(org.apache.harmony.security.asn1.ASN1StringType) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>

android-sdk-annotations/org/apache/harmony/security/fortress/annotations.xml

@@ -5,10 +5,13 @@
     <item name='org.apache.harmony.security.fortress.Services int insertProviderAt(java.security.Provider, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.fortress.Services java.util.List&lt;java.security.Provider&gt; getProvidersList()'>
+    <item name='org.apache.harmony.security.fortress.SecurityAccess java.security.Provider.Service getService(java.security.Provider, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.fortress.SecurityAccess java.security.Provider.Service getService(java.security.Provider, java.lang.String) 0'>
+    <item name='org.apache.harmony.security.fortress.Engine org.apache.harmony.security.fortress.Engine.SpiAndProvider getInstance(java.lang.String, java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.fortress.Services java.util.List&lt;java.security.Provider&gt; getProvidersList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.fortress.Engine java.lang.Object getInstance(java.lang.String, java.security.Provider, java.lang.Object) 1'>
@@ -17,7 +20,7 @@
     <item name='org.apache.harmony.security.fortress.Engine org.apache.harmony.security.fortress.Engine.SpiAndProvider getInstance(java.lang.String, java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.fortress.Engine org.apache.harmony.security.fortress.Engine.SpiAndProvider getInstance(java.lang.String, java.lang.Object)'>
+    <item name='org.apache.harmony.security.fortress.Services java.security.Provider[] getProviders()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.fortress.Engine java.lang.Object getInstance(java.lang.String, java.security.Provider, java.lang.Object) 0'>

android-sdk-annotations/org/apache/harmony/security/pkcs10/annotations.xml

@@ -1,7 +1,13 @@
 <root>
+    <item name='org.apache.harmony.security.pkcs10.CertificationRequestInfo ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.pkcs10.CertificationRequest byte[] getSignature()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.pkcs10.CertificationRequest ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.pkcs10.CertificationRequest CertificationRequest(org.apache.harmony.security.pkcs10.CertificationRequestInfo, org.apache.harmony.security.x509.AlgorithmIdentifier, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>

android-sdk-annotations/org/apache/harmony/security/pkcs7/annotations.xml

@@ -1,17 +1,47 @@
 <root>
+    <item name='org.apache.harmony.security.pkcs7.ContentInfo ENCRYPTED_DATA'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.pkcs7.ContentInfo SIGNED_AND_ENVELOPED_DATA'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.pkcs7.ContentInfo ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.pkcs7.ContentInfo DATA'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.pkcs7.ContentInfo SIGNED_DATA'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.pkcs7.SignerInfo ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.pkcs7.SignedData java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.pkcs7.ContentInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.pkcs7.ContentInfo ENVELOPED_DATA'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.pkcs7.SignerInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.pkcs7.SignerInfo java.math.BigInteger getSerialNumber()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.pkcs7.SignedData ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.pkcs7.SignerInfo ISSUER_AND_SERIAL_NUMBER'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.pkcs7.SignerInfo javax.security.auth.x500.X500Principal getIssuer()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.pkcs7.ContentInfo java.lang.String toString()'>
+    <item name='org.apache.harmony.security.pkcs7.ContentInfo DIGESTED_DATA'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>

android-sdk-annotations/org/apache/harmony/security/pkcs8/annotations.xml

@@ -0,0 +1,5 @@
+<root>
+    <item name='org.apache.harmony.security.pkcs8.PrivateKeyInfo ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>

android-sdk-annotations/org/apache/harmony/security/provider/cert/annotations.xml

@@ -5,33 +5,27 @@
     <item name='org.apache.harmony.security.provider.cert.X509CRLImpl X509CRLImpl(org.apache.harmony.security.x509.CertificateList) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CRLEntryImpl byte[] getEncoded()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.util.Iterator&lt;java.lang.String&gt; engineGetCertPathEncodings()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.X509CRLImpl java.security.cert.X509CRLEntry getRevokedCertificate(java.math.BigInteger) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CRLEntryImpl java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.security.Principal getIssuerDN()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertImpl X509CertImpl(org.apache.harmony.security.x509.Certificate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.Cache void put(long, byte[], java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CRL engineGenerateCRL(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertImpl javax.security.auth.x500.X500Principal getSubjectX500Principal()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertImpl void checkValidity(java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.Certificate engineGenerateCertificate(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.util.Date getNotAfter()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.provider.cert.X509CRLEntryImpl X509CRLEntryImpl(org.apache.harmony.security.x509.TBSCertList.RevokedCertificate, javax.security.auth.x500.X500Principal) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -41,70 +35,88 @@
     <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CRL engineGenerateCRL(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl byte[] getEncoded()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.util.Collection&lt;? extends java.security.cert.CRL&gt; engineGenerateCRLs(java.io.InputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertImpl byte[] getExtensionValue(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CRLEntryImpl byte[] getExtensionValue(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.util.Date getNotBefore()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CertPath engineGenerateCertPath(java.util.List&lt;? extends java.security.cert.Certificate&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.security.Principal getSubjectDN()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.util.Collection&lt;? extends java.security.cert.Certificate&gt; engineGenerateCertificates(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertImpl javax.security.auth.x500.X500Principal getIssuerX500Principal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertPathImpl java.util.List&lt;java.security.cert.X509Certificate&gt; getCertificates()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.util.Collection&lt;? extends java.security.cert.CRL&gt; engineGenerateCRLs(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.util.Collection&lt;? extends java.security.cert.CRL&gt; engineGenerateCRLs(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl byte[] getExtensionValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLEntryImpl java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLEntryImpl byte[] getEncoded()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLEntryImpl byte[] getExtensionValue(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl byte[] getSignature()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertPathImpl X509CertPathImpl(java.util.List&lt;? extends java.security.cert.Certificate&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl byte[] getTBSCertList()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.security.Principal getIssuerDN()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertPathImpl ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl javax.security.auth.x500.X500Principal getSubjectX500Principal()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CertPath engineGenerateCertPath(java.util.List&lt;? extends java.security.cert.Certificate&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CertPath engineGenerateCertPath(java.util.List&lt;? extends java.security.cert.Certificate&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.provider.cert.X509CRLImpl java.security.cert.X509CRLEntry getRevokedCertificate(java.security.cert.X509Certificate) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl byte[] getTBSCertList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.util.Date getNotBefore()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.util.Collection&lt;? extends java.security.cert.Certificate&gt; engineGenerateCertificates(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.security.Principal getSubjectDN()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.Certificate engineGenerateCertificate(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertPathImpl java.util.List&lt;java.security.cert.X509Certificate&gt; getCertificates()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.util.Collection&lt;? extends java.security.cert.CRL&gt; engineGenerateCRLs(java.io.InputStream)'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CRL engineGenerateCRL(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertImpl void verify(java.security.PublicKey, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl byte[] getSignature()'>
+    <item name='org.apache.harmony.security.provider.cert.X509CRLImpl byte[] getEncoded()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.X509CRLImpl void verify(java.security.PublicKey, java.lang.String) 1'>
@@ -113,18 +125,15 @@
     <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.util.Date getNotAfter()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.security.cert.Certificate engineGenerateCertificate(java.io.InputStream)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.cert.X509CertFactoryImpl java.util.Collection&lt;? extends java.security.cert.Certificate&gt; engineGenerateCertificates(java.io.InputStream)'>
+    <item name='org.apache.harmony.security.provider.cert.X509CertPathImpl java.util.Iterator&lt;java.lang.String&gt; getEncodings()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.cert.X509CertPathImpl byte[] getEncoded(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.provider.cert.X509CertImpl java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.provider.cert.X509CRLImpl byte[] getExtensionValue(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>

android-sdk-annotations/org/apache/harmony/security/provider/crypto/annotations.xml

@@ -1,5 +1,8 @@
 <root>
-    <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec)'>
+    <item name='org.apache.harmony.security.provider.crypto.SHA1_MessageDigestImpl java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl byte[] engineSign()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.crypto.DSAPrivateKeyImpl DSAPrivateKeyImpl(java.security.spec.DSAPrivateKeySpec) 0'>
@@ -11,16 +14,13 @@
     <item name='org.apache.harmony.security.provider.crypto.SHA1PRNG_SecureRandomImpl void engineNextBytes(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl byte[] engineSign()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl void engineUpdate(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.crypto.SHA1_MessageDigestImpl java.lang.Object clone()'>
+    <item name='org.apache.harmony.security.provider.crypto.SHA1PRNG_SecureRandomImpl void engineSetSeed(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.crypto.SHA1PRNG_SecureRandomImpl void engineSetSeed(byte[]) 0'>
+    <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl void engineInitSign(java.security.PrivateKey) 0'>
@@ -35,9 +35,6 @@
     <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl boolean engineVerify(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.crypto.SHA1_MessageDigestImpl byte[] engineDigest()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -47,24 +44,24 @@
     <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl boolean engineVerify(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.provider.crypto.SHA1_MessageDigestImpl byte[] engineDigest()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.crypto.SHA1_MessageDigestImpl int engineDigest(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.Key engineTranslateKey(java.security.Key)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.provider.crypto.SHA1PRNG_SecureRandomImpl byte[] engineGenerateSeed(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl java.lang.Object engineGetParameter(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.crypto.DSAPublicKeyImpl DSAPublicKeyImpl(java.security.spec.X509EncodedKeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.provider.crypto.SHA1PRNG_SecureRandomImpl byte[] engineGenerateSeed(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl T engineGetKeySpec(java.security.Key, java.lang.Class&lt;T&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -74,10 +71,13 @@
     <item name='org.apache.harmony.security.provider.crypto.SHA1withDSA_SignatureImpl void engineInitVerify(java.security.PublicKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)'>
+    <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.Key engineTranslateKey(java.security.Key)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.provider.crypto.DSAKeyFactoryImpl java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>

android-sdk-annotations/org/apache/harmony/security/utils/annotations.xml

@@ -11,6 +11,9 @@
     <item name='org.apache.harmony.security.utils.Array java.lang.String getBytesAsString(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.utils.Array java.lang.String toString(byte[], java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.utils.ObjectIdentifier void validateOid(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -38,9 +41,6 @@
     <item name='org.apache.harmony.security.utils.ObjectIdentifier int[] getOid()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.utils.Array java.lang.String toString(byte[], java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.utils.ObjectIdentifier int hashIntArray(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>

android-sdk-annotations/org/apache/harmony/security/x501/annotations.xml

@@ -2,31 +2,52 @@
     <item name='org.apache.harmony.security.x501.Name Name(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x501.AttributeValue AttributeValue(java.lang.String, byte[]) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x501.Name Name(byte[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x501.AttributeValue void appendQEString(java.lang.StringBuilder) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x501.AttributeTypeAndValue org.apache.harmony.security.utils.ObjectIdentifier getObjectIdentifier(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x501.AttributeTypeAndValue void appendName(java.lang.String, java.lang.StringBuilder) 1'>
+    <item name='org.apache.harmony.security.x501.AttributeValue void appendQEString(java.lang.StringBuilder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x501.AttributeTypeAndValueComparator int compare(java.lang.Object, java.lang.Object) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x501.AttributeTypeAndValueComparator int compare(java.lang.Object, java.lang.Object) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x501.Name javax.security.auth.x500.X500Principal getX500Principal()'>
+    <item name='org.apache.harmony.security.x501.Name ASN1_RDN'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x501.AttributeTypeAndValue org.apache.harmony.security.utils.ObjectIdentifier getObjectIdentifier(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x501.AttributeTypeAndValueComparator int compare(java.lang.Object, java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x501.AttributeTypeAndValue ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x501.AttributeValue AttributeValue(java.lang.String, byte[]) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x501.DirectoryString ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x501.Name ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x501.AttributeTypeAndValue void appendName(java.lang.String, java.lang.StringBuilder) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x501.Name javax.security.auth.x500.X500Principal getX500Principal()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x501.AttributeTypeAndValue DC'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x501.AttributeTypeAndValueComparator int compare(java.lang.Object, java.lang.Object) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x501.AttributeTypeAndValue EMAILADDRESS'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x501.AttributeTypeAndValue attributeValue'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>

android-sdk-annotations/org/apache/harmony/security/x509/annotations.xml

@@ -2,57 +2,33 @@
     <item name='org.apache.harmony.security.x509.GeneralName byte[] ipStrToBytes(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.ReasonCode ReasonCode(byte[]) 0'>
+    <item name='org.apache.harmony.security.x509.AccessDescription ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.CRLDistributionPoints org.apache.harmony.security.x509.CRLDistributionPoints decode(byte[]) 0'>
+    <item name='org.apache.harmony.security.x509.Validity ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.CertificatePolicies org.apache.harmony.security.x509.CertificatePolicies decode(byte[]) 0'>
+    <item name='org.apache.harmony.security.x509.PrivateKeyUsagePeriod ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.Extension void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.InhibitAnyPolicy void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
+    <item name='org.apache.harmony.security.x509.IssuingDistributionPoint org.apache.harmony.security.x509.IssuingDistributionPoint decode(byte[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.GeneralName GeneralName(byte[]) 0'>
+    <item name='org.apache.harmony.security.x509.ReasonCode ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.X509PublicKey java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.ExtensionValue void dumpValue(java.lang.StringBuilder) 0'>
+    <item name='org.apache.harmony.security.x509.AlgorithmIdentifier ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.DNParser java.util.List&lt;java.util.List&lt;org.apache.harmony.security.x501.AttributeTypeAndValue&gt;&gt; parse()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.GeneralName java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.Extension Extension(java.lang.String, boolean, org.apache.harmony.security.x509.ExtensionValue) 2'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.AlternativeName void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.X509PublicKey java.lang.String getFormat()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x509.ExtendedKeyUsage void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.InvalidityDate InvalidityDate(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.CertificatePolicies org.apache.harmony.security.x509.CertificatePolicies addPolicyInformation(org.apache.harmony.security.x509.PolicyInformation)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.PolicyInformation void dumpValue(java.lang.StringBuilder) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x509.ReasonFlags void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -62,22 +38,175 @@
     <item name='org.apache.harmony.security.x509.GeneralName void checkURI(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.CRLNumber CRLNumber(byte[]) 0'>
+    <item name='org.apache.harmony.security.x509.TBSCertList ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.IssuingDistributionPoint void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
+    <item name='org.apache.harmony.security.x509.CertificateList byte[] getSignatureValue()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.InvalidityDate void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.CertificatePolicies java.util.List&lt;org.apache.harmony.security.x509.PolicyInformation&gt; getPolicyInformations()'>
+    <item name='org.apache.harmony.security.x509.Certificate Certificate(org.apache.harmony.security.x509.TBSCertificate, org.apache.harmony.security.x509.AlgorithmIdentifier, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.ReasonCode void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.Certificate Certificate(org.apache.harmony.security.x509.TBSCertificate, org.apache.harmony.security.x509.AlgorithmIdentifier, byte[]) 2'>
+    <item name='org.apache.harmony.security.x509.CertificateList java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.OtherName ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.TBSCertList.RevokedCertificate void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.DistributionPointName ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.Extension ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.AuthorityKeyIdentifier org.apache.harmony.security.x509.AuthorityKeyIdentifier decode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.GeneralName int[] oidStrToInts(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.GeneralSubtree ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.Time ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.EDIPartyName ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.BasicConstraints BasicConstraints(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.GeneralName GeneralName(int, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.AccessDescription java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.CRLNumber ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.AuthorityKeyIdentifier org.apache.harmony.security.x509.AuthorityKeyIdentifier decode(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.NameConstraints void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.SubjectKeyIdentifier org.apache.harmony.security.x509.SubjectKeyIdentifier decode(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.DistributionPointName void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.InfoAccessSyntax org.apache.harmony.security.x509.InfoAccessSyntax decode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.InfoAccessSyntax ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.CRLDistributionPoints ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.TBSCertList void dumpValue(java.lang.StringBuilder) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.InfoAccessSyntax void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.KeyUsage KeyUsage(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.GeneralName java.lang.String ipBytesToStr(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.ExtensionValue void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.InvalidityDate ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.Certificate java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.IssuingDistributionPoint ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.ReasonCode ReasonCode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.CRLDistributionPoints org.apache.harmony.security.x509.CRLDistributionPoints decode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.CertificatePolicies org.apache.harmony.security.x509.CertificatePolicies decode(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.GeneralName GeneralName(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.InhibitAnyPolicy void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.ExtensionValue void dumpValue(java.lang.StringBuilder) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.X509PublicKey java.lang.String getFormat()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.Extension Extension(java.lang.String, boolean, org.apache.harmony.security.x509.ExtensionValue) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.AuthorityKeyIdentifier ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.GeneralNames ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.Certificate ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.CertificatePolicies ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.AlternativeName void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.GeneralName java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.DistributionPoint ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.CertificatePolicies org.apache.harmony.security.x509.CertificatePolicies decode(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.InvalidityDate InvalidityDate(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.GeneralNames java.util.Collection&lt;java.util.List&lt;?&gt;&gt; getPairsList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.TBSCertList.RevokedCertificate ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.PolicyInformation void dumpValue(java.lang.StringBuilder) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.CRLNumber CRLNumber(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.InvalidityDate void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.IssuingDistributionPoint void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.CRLNumber java.math.BigInteger getNumber()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.AuthorityKeyIdentifier void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
@@ -86,12 +215,6 @@
     <item name='org.apache.harmony.security.x509.CRLDistributionPoints void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.TBSCertList.RevokedCertificate void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.InfoAccessSyntax java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x509.CRLNumber void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -104,24 +227,27 @@
     <item name='org.apache.harmony.security.x509.CertificatePolicies void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.GeneralName int[] oidStrToInts(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.AuthorityKeyIdentifier org.apache.harmony.security.x509.AuthorityKeyIdentifier decode(byte[]) 0'>
+    <item name='org.apache.harmony.security.x509.CertificatePolicies org.apache.harmony.security.x509.CertificatePolicies addPolicyInformation(org.apache.harmony.security.x509.PolicyInformation)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.NameConstraints boolean isAcceptable(java.util.List&lt;org.apache.harmony.security.x509.GeneralName&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.AuthorityKeyIdentifier org.apache.harmony.security.x509.AuthorityKeyIdentifier decode(byte[])'>
+    <item name='org.apache.harmony.security.x509.PolicyQualifierInfo ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.CertificateList java.lang.String toString()'>
+    <item name='org.apache.harmony.security.x509.BasicConstraints ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.X509PublicKey java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.TBSCertificate void dumpValue(java.lang.StringBuilder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x509.NameConstraints ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.x509.GeneralName java.util.List&lt;java.lang.Object&gt; getAsList()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -131,91 +257,79 @@
     <item name='org.apache.harmony.security.x509.GeneralName int[] oidStrToInts(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.BasicConstraints BasicConstraints(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.GeneralName GeneralName(int, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x509.GeneralName GeneralName(int, byte[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x509.CertificateList ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.x509.CertificateList CertificateList(org.apache.harmony.security.x509.TBSCertList, org.apache.harmony.security.x509.AlgorithmIdentifier, byte[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x509.InfoAccessSyntax java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.CertificateIssuer ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='org.apache.harmony.security.x509.AlgorithmIdentifier void dumpValue(java.lang.StringBuilder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.GeneralNames java.util.Collection&lt;java.util.List&lt;?&gt;&gt; getPairsList()'>
+    <item name='org.apache.harmony.security.x509.Extensions ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.NameConstraints void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
+    <item name='org.apache.harmony.security.x509.ReasonFlags ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.DistributionPointName void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
+    <item name='org.apache.harmony.security.x509.PolicyInformation ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.CRLNumber java.math.BigInteger getNumber()'>
+    <item name='org.apache.harmony.security.x509.GeneralSubtrees ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.CertificatePolicies org.apache.harmony.security.x509.CertificatePolicies decode(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.AccessDescription java.lang.String toString()'>
+    <item name='org.apache.harmony.security.x509.CertificatePolicies java.util.List&lt;org.apache.harmony.security.x509.PolicyInformation&gt; getPolicyInformations()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.GeneralName void checkDNS(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.InfoAccessSyntax org.apache.harmony.security.x509.InfoAccessSyntax decode(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x509.DistributionPoint void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.CertificateList byte[] getSignatureValue()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.TBSCertList void dumpValue(java.lang.StringBuilder) 0'>
+    <item name='org.apache.harmony.security.x509.SubjectPublicKeyInfo ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.PolicyConstraints void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.InfoAccessSyntax void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.Certificate java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.SubjectKeyIdentifier org.apache.harmony.security.x509.SubjectKeyIdentifier decode(byte[])'>
+    <item name='org.apache.harmony.security.x509.ExtendedKeyUsage ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.AlternativeName AlternativeName(boolean, byte[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.KeyUsage KeyUsage(byte[]) 0'>
+    <item name='org.apache.harmony.security.x509.PolicyConstraints ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.DNParser DNParser(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.GeneralName java.lang.String ipBytesToStr(byte[]) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x509.CertificateIssuer void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.ExtensionValue void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='org.apache.harmony.security.x509.GeneralSubtree void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.IssuingDistributionPoint org.apache.harmony.security.x509.IssuingDistributionPoint decode(byte[])'>
+    <item name='org.apache.harmony.security.x509.TBSCertificate ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.GeneralName ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.BasicConstraints void dumpValue(java.lang.StringBuilder, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.apache.harmony.security.x509.ORAddress ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>

android-sdk-annotations/org/apache/harmony/security/x509/tsp/annotations.xml

@@ -1,32 +1,92 @@
 <root>
-    <item name='org.apache.harmony.security.x509.tsp.PKIStatusInfo java.lang.String toString()'>
+    <item name='org.apache.harmony.security.x509.tsp.TimeStampResp java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo org.apache.harmony.security.x509.tsp.PKIFailureInfo getInstance(int)'>
+    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo UNACCEPTED_EXTENSION'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.tsp.PKIStatus org.apache.harmony.security.x509.tsp.PKIStatus valueOf(java.lang.String)'>
+    <item name='org.apache.harmony.security.x509.tsp.TimeStampReq ASN1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.tsp.TSTInfo java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.tsp.TimeStampReq java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.harmony.security.x509.tsp.PKIStatus org.apache.harmony.security.x509.tsp.PKIStatus getInstance(int)'>
+    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo SYSTEM_FAILURE'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo org.apache.harmony.security.x509.tsp.PKIFailureInfo valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo org.apache.harmony.security.x509.tsp.PKIFailureInfo valueOf(java.lang.String) 0'>
+    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo TIME_NOT_AVAILABLE'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.TSTInfo ACCURACY'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.TSTInfo ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIStatus WAITING'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIStatus REJECTION'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='org.apache.harmony.security.x509.tsp.PKIStatus org.apache.harmony.security.x509.tsp.PKIStatus valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='org.apache.harmony.security.x509.tsp.TimeStampResp java.lang.String toString()'>
+    <item name='org.apache.harmony.security.x509.tsp.PKIStatusInfo ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.TimeStampResp ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo org.apache.harmony.security.x509.tsp.PKIFailureInfo getInstance(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.MessageImprint ASN1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo BAD_DATA_FORMAT'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo ADD_INFO_NOT_AVAILABLE'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIStatus GRANTED_WITH_MODS'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.TSTInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIStatus REVOCATION_NOTIFICATION'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.TimeStampReq java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIStatus org.apache.harmony.security.x509.tsp.PKIStatus valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIStatusInfo java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo UNACCEPTED_POLICY'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIStatus org.apache.harmony.security.x509.tsp.PKIStatus getInstance(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIStatus GRANTED'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo BAD_REQUEST'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo org.apache.harmony.security.x509.tsp.PKIFailureInfo valueOf(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIFailureInfo BAD_ALG'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.harmony.security.x509.tsp.PKIStatus REVOCATION_WARNING'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>