Fix inconsistencies in Android annotations

android-sdk-annotations/libcore/icu/annotations.xml

@@ -1,8 +1,8 @@
 <root>
-    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex addLabels(java.util.Locale)'>
+    <item name='libcore.icu.NativeNormalizer boolean isNormalized(java.lang.CharSequence, java.text.Normalizer.Form) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.NativeNormalizer boolean isNormalized(java.lang.CharSequence, java.text.Normalizer.Form) 1'>
+    <item name='libcore.icu.TimeZoneNames.ZoneStringsCache java.lang.String[][] create(java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.TimeZoneNames java.lang.String getDisplayName(java.lang.String[][], java.lang.String, boolean, int) 0'>
@@ -14,6 +14,9 @@
     <item name='libcore.icu.NativeDecimalFormat void setRoundingMode(java.math.RoundingMode, double) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getCharacterInstance(java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.RuleBasedCollatorICU RuleBasedCollatorICU(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -26,34 +29,49 @@
     <item name='libcore.icu.NativeNormalizer java.lang.String normalize(java.lang.CharSequence, java.text.Normalizer.Form) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.NativeBreakIterator java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex addLabels(java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getCharacterInstance(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getWordInstance(java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.NativeDecimalFormat java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.RuleBasedCollatorICU libcore.icu.CollationElementIteratorICU getCollationElementIterator(java.text.CharacterIterator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.NativePluralRules libcore.icu.NativePluralRules forLocale(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.RuleBasedCollatorICU libcore.icu.CollationElementIteratorICU getCollationElementIterator(java.text.CharacterIterator)'>
+    <item name='libcore.icu.ICU char[] getDateFormatOrder(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getSentenceInstance(java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.LocaleData java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.RuleBasedCollatorICU java.lang.Object clone()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.TimeZoneNames.ZoneStringsCache java.lang.String[][] create(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.ICU java.util.Locale localeFromString(java.lang.String)'>
+    <item name='libcore.icu.RuleBasedCollatorICU libcore.icu.CollationElementIteratorICU getCollationElementIterator(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex addLabelRange(int, int)'>
+    <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getLineInstance(java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.NativeDecimalFormat java.lang.Object clone()'>
+    <item name='libcore.icu.NativeDecimalFormat java.text.AttributedCharacterIterator formatToCharacterIterator(java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.NativeConverter void setCallbackEncode(long, java.nio.charset.CharsetEncoder) 1'>
@@ -62,22 +80,22 @@
     <item name='libcore.icu.NativeNormalizer java.lang.String normalize(java.lang.CharSequence, java.text.Normalizer.Form) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.TimeZoneNames.ZoneStringsCache java.lang.Object create(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.icu.NativeDecimalFormat java.text.AttributedCharacterIterator formatToCharacterIterator(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.CollationElementIteratorICU libcore.icu.CollationElementIteratorICU getInstance(long, java.lang.String)'>
+    <item name='libcore.icu.NativePluralRules libcore.icu.NativePluralRules forLocale(java.util.Locale)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.NativeDecimalFormat NativeDecimalFormat(java.lang.String, libcore.icu.LocaleData) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.DateIntervalFormat java.lang.String formatDateRange(java.util.Locale, java.util.TimeZone, long, long, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.NativeDecimalFormat java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.DateIntervalFormat java.lang.String formatDateRange(java.util.Locale, java.util.TimeZone, long, long, int) 1'>
+    <item name='libcore.icu.TimeZoneNames.ZoneStringsCache java.lang.Object create(java.lang.Object)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.ICU java.util.Locale localeFromString(java.lang.String) 0'>
@@ -95,36 +113,39 @@
     <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getLineInstance(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.TimeZoneNames java.lang.String[] forLocale(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.icu.DateIntervalFormat java.lang.String formatDateRange(java.util.Locale, java.util.TimeZone, long, long, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.NativeDecimalFormat java.text.AttributedCharacterIterator formatToCharacterIterator(java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getLineInstance(java.util.Locale)'>
+    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex addLabelRange(int, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.ICU java.util.Locale[] localesFromStrings(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.RuleBasedCollatorICU libcore.icu.CollationElementIteratorICU getCollationElementIterator(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.icu.NativeBreakIterator java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getSentenceInstance(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.NativeConverter void setCallbackDecode(long, java.nio.charset.CharsetDecoder) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.LocaleData libcore.icu.LocaleData get(java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.icu.CollationElementIteratorICU libcore.icu.CollationElementIteratorICU getInstance(long, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.CollationElementIteratorICU void setText(java.text.CharacterIterator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.TimeZoneNames java.lang.String[] forLocale(java.util.Locale)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.icu.ICU java.util.Locale localeFromString(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex.ImmutableIndex getImmutableIndex()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.AlphabeticIndex AlphabeticIndex(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -134,57 +155,36 @@
     <item name='libcore.icu.NativeDecimalFormat void setDecimalFormatSymbols(java.text.DecimalFormatSymbols) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getCharacterInstance(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.icu.NativeDecimalFormat char[] formatBigDecimal(java.math.BigDecimal, java.text.FieldPosition) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.TimeZoneNames java.lang.String[] forLocale(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.RuleBasedCollatorICU java.lang.Object clone()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex.ImmutableIndex getImmutableIndex()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex setMaxLabelCount(int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.icu.NativeNormalizer boolean isNormalized(java.lang.CharSequence, java.text.Normalizer.Form) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.TimeZoneNames.ZoneStringsCache java.lang.Object create(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex setMaxLabelCount(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.RuleBasedCollatorICU RuleBasedCollatorICU(java.util.Locale) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.icu.CollationKeyICU int compareTo(java.text.CollationKey) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.icu.RuleBasedCollatorICU libcore.icu.CollationElementIteratorICU getCollationElementIterator(java.text.CharacterIterator)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.icu.NativeBreakIterator void setText(java.text.CharacterIterator) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.TimeZoneNames.ZoneStringsCache java.lang.String[][] create(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.icu.NativeDecimalFormat void setDecimalFormatSymbols(libcore.icu.LocaleData) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.icu.NativeBreakIterator libcore.icu.NativeBreakIterator getSentenceInstance(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.icu.NativePluralRules libcore.icu.NativePluralRules forLocale(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.icu.LocaleData libcore.icu.LocaleData get(java.util.Locale)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.icu.ICU char[] getDateFormatOrder(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.icu.CollationKeyICU int compareTo(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>

android-sdk-annotations/libcore/io/annotations.xml

@@ -1,17 +1,17 @@
 <root>
+    <item name='libcore.io.StructPollfd java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.io.IoBridge void closeSocket(java.io.FileDescriptor) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Posix int pread(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.ErrnoException java.lang.String getMessage()'>
+    <item name='libcore.io.BlockGuardOs int sendto(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetAddress, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.StructLinger java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.io.StructPollfd java.lang.String toString()'>
+    <item name='libcore.io.Streams java.lang.String readFully(java.io.Reader)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Memory int peekInt(byte[], int, java.nio.ByteOrder) 0'>
@@ -23,16 +23,19 @@
     <item name='libcore.io.Memory void pokeShort(byte[], int, short, java.nio.ByteOrder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.MemoryMappedFile libcore.io.MemoryMappedFile mmapRO(java.lang.String)'>
+    <item name='libcore.io.Os int pwrite(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.IoUtils java.io.File createTemporaryDirectory(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Posix int recvfrom(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetSocketAddress) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.DropBox void setReporter(libcore.io.DropBox.Reporter) 0'>
+    <item name='libcore.io.BlockGuardOs int recvfrom(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetSocketAddress) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.StructTimeval java.lang.String toString()'>
+    <item name='libcore.io.DropBox void setReporter(libcore.io.DropBox.Reporter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Base64 byte[] decode(byte[]) 0'>
@@ -41,21 +44,42 @@
     <item name='libcore.io.IoBridge int read(java.io.FileDescriptor, byte[], int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.Streams java.lang.String readAsciiLine(java.io.InputStream)'>
+    <item name='libcore.io.MemoryMappedFile libcore.io.BufferIterator bigEndianIterator()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.StructUcred java.lang.String toString()'>
+    <item name='libcore.io.Streams byte[] readFullyNoClose(java.io.InputStream)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Streams void skipAll(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.IoUtils java.io.File createTemporaryDirectory(java.lang.String)'>
+    <item name='libcore.io.Os int write(java.io.FileDescriptor, java.nio.ByteBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.BlockGuardOs int pwrite(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.IoBridge java.io.FileDescriptor open(java.lang.String, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.Os int recvfrom(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetSocketAddress) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Posix int pwrite(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.io.ForwardingOs int write(java.io.FileDescriptor, java.nio.ByteBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.StructUcred java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.Os int read(java.io.FileDescriptor, java.nio.ByteBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.Os int sendto(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetAddress, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.io.IoUtils byte[] readFileAsByteArray(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -65,28 +89,37 @@
     <item name='libcore.io.Posix int sendto(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetAddress, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.io.ForwardingOs int pread(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.StructTimeval libcore.io.StructTimeval fromMillis(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.Os int pread(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.io.Streams void writeSingleByte(java.io.OutputStream, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.GaiException java.lang.String getMessage()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.io.MemoryMappedFile libcore.io.BufferIterator littleEndianIterator()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.io.Streams byte[] readFullyNoClose(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Streams int copy(java.io.InputStream, java.io.OutputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.io.StructLinger java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.io.Streams int readSingleByte(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.StructGroupReq java.lang.String toString()'>
+    <item name='libcore.io.GaiException java.lang.String getMessage()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.StrictLineReader java.lang.String readLine()'>
+    <item name='libcore.io.BlockGuardOs int write(java.io.FileDescriptor, java.nio.ByteBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.ForwardingOs int read(java.io.FileDescriptor, java.nio.ByteBuffer) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Memory long peekLong(byte[], int, java.nio.ByteOrder) 0'>
@@ -95,61 +128,91 @@
     <item name='libcore.io.Streams java.lang.String readAsciiLine(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.IoBridge java.io.FileDescriptor open(java.lang.String, int)'>
+    <item name='libcore.io.BlockGuardOs int pread(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.MemoryMappedFile libcore.io.BufferIterator bigEndianIterator()'>
+    <item name='libcore.io.StructTimeval java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.StructGroupReq java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.ForwardingOs int sendto(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetAddress, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.MemoryMappedFile libcore.io.MemoryMappedFile mmapRO(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.StrictLineReader StrictLineReader(java.io.InputStream, java.nio.charset.Charset) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.StructTimeval libcore.io.StructTimeval fromMillis(long)'>
+    <item name='libcore.io.ForwardingOs int pwrite(java.io.FileDescriptor, java.nio.ByteBuffer, long) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Posix int write(java.io.FileDescriptor, java.nio.ByteBuffer) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.Streams java.lang.String readFully(java.io.Reader)'>
+    <item name='libcore.io.DropBox.Reporter void addData(java.lang.String, byte[], int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.Streams byte[] readFully(java.io.InputStream)'>
+    <item name='libcore.io.EventLogger.Reporter void report(int, java.lang.Object...) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.EventLogger void setReporter(libcore.io.EventLogger.Reporter) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.IoUtils java.lang.String readFileAsString(java.lang.String)'>
+    <item name='libcore.io.Memory void pokeInt(byte[], int, int, java.nio.ByteOrder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.Memory void pokeInt(byte[], int, int, java.nio.ByteOrder) 0'>
+    <item name='libcore.io.IoUtils java.lang.String readFileAsString(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.Memory void pokeLong(byte[], int, long, java.nio.ByteOrder) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.Streams byte[] readFully(java.io.InputStream) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.io.IoUtils java.lang.String readFileAsString(java.lang.String) 0'>
+    <item name='libcore.io.ForwardingOs int recvfrom(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetSocketAddress) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.HeapBufferIterator libcore.io.BufferIterator iterator(byte[], int, int, java.nio.ByteOrder)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.io.Base64 java.lang.String encode(byte[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.Streams byte[] readFully(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.Streams byte[] readFully(java.io.InputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.BlockGuardOs int read(java.io.FileDescriptor, java.nio.ByteBuffer) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.MemoryMappedFile libcore.io.BufferIterator littleEndianIterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.IoUtils java.lang.String readFileAsString(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.io.StrictLineReader StrictLineReader(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.IoUtils void deleteContents(java.io.File) 0'>
+    <item name='libcore.io.ErrnoException java.lang.String getMessage()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.StrictLineReader StrictLineReader(java.io.InputStream, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.io.IoUtils void deleteContents(java.io.File) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.io.Streams java.lang.String readFully(java.io.Reader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.Streams byte[] readFullyNoClose(java.io.InputStream)'>
+    <item name='libcore.io.Streams java.lang.String readAsciiLine(java.io.InputStream)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.io.StrictLineReader java.lang.String readLine()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.io.IoBridge void write(java.io.FileDescriptor, byte[], int, int) 1'>
@@ -170,7 +233,4 @@
     <item name='libcore.io.StrictLineReader StrictLineReader(java.io.InputStream, java.nio.charset.Charset) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.io.Base64 java.lang.String encode(byte[])'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
 </root>

android-sdk-annotations/libcore/net/annotations.xml

@@ -8,7 +8,7 @@
     <item name='libcore.net.UriCodec java.lang.String encode(java.lang.String, java.nio.charset.Charset) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String)'>
+    <item name='libcore.net.UriCodec java.lang.String validate(java.lang.String, int, int, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.net.UriCodec void appendPartiallyEncoded(java.lang.StringBuilder, java.lang.String) 1'>
@@ -17,19 +17,19 @@
     <item name='libcore.net.UriCodec void appendEncoded(java.lang.StringBuilder, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String) 0'>
+    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String, boolean, java.nio.charset.Charset, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.UriCodec java.lang.String validate(java.lang.String, int, int, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String, boolean, java.nio.charset.Charset, boolean) 0'>
+    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.net.UriCodec java.lang.String encode(java.lang.String, java.nio.charset.Charset)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String, boolean, java.nio.charset.Charset, boolean)'>
+    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.UriCodec java.lang.String decode(java.lang.String, boolean, java.nio.charset.Charset, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>

android-sdk-annotations/libcore/net/url/annotations.xml

@@ -1,26 +1,59 @@
 <root>
-    <item name='libcore.net.url.JarHandler java.lang.String toExternalForm(java.net.URL) 0'>
+    <item name='libcore.net.url.FileURLConnection java.lang.String getContentType()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) 1'>
+    <item name='libcore.net.url.FileHandler void parseURL(java.net.URL, java.lang.String, int, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.JarURLConnectionImpl JarURLConnectionImpl(java.net.URL) 0'>
+    <item name='libcore.net.url.UrlUtils java.lang.String canonicalizePath(java.lang.String, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.net.url.JarHandler void parseURL(java.net.URL, java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.JarHandler java.lang.String toExternalForm(java.net.URL)'>
+    <item name='libcore.net.url.JarURLConnectionImpl JarURLConnectionImpl(java.net.URL) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.net.url.FileHandler java.net.URLConnection openConnection(java.net.URL) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.net.url.FtpURLConnection FtpURLConnection(java.net.URL) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.JarHandler java.net.URLConnection openConnection(java.net.URL)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.JarHandler java.net.URLConnection openConnection(java.net.URL) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.FileHandler java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.JarURLConnectionImpl java.security.Permission getPermission()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.FtpURLConnection java.security.Permission getPermission()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.FileURLConnection FileURLConnection(java.net.URL) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.JarHandler java.lang.String toExternalForm(java.net.URL) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.net.url.JarHandler void parseURL(java.net.URL, java.lang.String, int, int) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.net.url.FtpURLConnection FtpURLConnection(java.net.URL, java.net.Proxy) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.FtpURLConnection FtpURLConnection(java.net.URL) 0'>
+    <item name='libcore.net.url.JarURLConnectionImpl java.lang.String getContentType()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.net.url.UrlUtils java.lang.String getSchemePrefix(java.lang.String) 0'>
@@ -29,22 +62,7 @@
     <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.FtpURLConnection java.security.Permission getPermission()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.url.JarHandler java.net.URLConnection openConnection(java.net.URL) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.url.UrlUtils java.lang.String canonicalizePath(java.lang.String, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.url.JarHandler java.net.URLConnection openConnection(java.net.URL)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.url.FtpURLConnection java.lang.String getContentType()'>
+    <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL, java.net.Proxy)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.net.url.UrlUtils java.lang.String canonicalizePath(java.lang.String, boolean) 0'>
@@ -53,22 +71,16 @@
     <item name='libcore.net.url.FileHandler java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.JarURLConnectionImpl java.lang.String getContentType()'>
+    <item name='libcore.net.url.JarHandler java.lang.String toExternalForm(java.net.URL)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.FileURLConnection FileURLConnection(java.net.URL) 0'>
+    <item name='libcore.net.url.FtpURLConnection java.lang.String getContentType()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.net.url.JarURLConnectionImpl java.security.Permission getPermission()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.url.FileURLConnection java.lang.String getContentType()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.net.url.FtpHandler java.net.URLConnection openConnection(java.net.URL, java.net.Proxy)'>
+    <item name='libcore.net.url.FileHandler void parseURL(java.net.URL, java.lang.String, int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
 </root>

android-sdk-annotations/libcore/reflect/annotations.xml

@@ -1,7 +1,4 @@
 <root>
-    <item name='libcore.reflect.AnnotationAccess java.lang.Class&lt;?&gt;[] typeIndexToInterfaces(java.lang.Class&lt;?&gt;, com.android.dex.Dex, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.reflect.AnnotationAccess A getAnnotation(java.lang.Class&lt;?&gt;, java.lang.Class&lt;A&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -11,9 +8,6 @@
     <item name='libcore.reflect.AnnotationAccess java.lang.String getInnerClassName(java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.ListOfTypes java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.reflect.InternalNames java.lang.String getInternalName(java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -29,16 +23,19 @@
     <item name='libcore.reflect.AnnotationMember boolean equalArrayValue(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.InternalNames java.lang.String getInternalName(java.lang.Class&lt;?&gt;)'>
+    <item name='libcore.reflect.AnnotationMember libcore.reflect.AnnotationMember setDefinition(libcore.reflect.AnnotationMember)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationAccess java.lang.Class&lt;?&gt;[] protoIndexToParameters(java.lang.Class&lt;?&gt;, com.android.dex.Dex, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.reflect.AnnotationFactory libcore.reflect.AnnotationMember[] getElementsDescription(java.lang.Class&lt;? extends java.lang.annotation.Annotation&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.reflect.AnnotationAccess boolean isAnnotationPresent(java.lang.Class&lt;?&gt;, java.lang.Class&lt;? extends java.lang.annotation.Annotation&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.WildcardTypeImpl java.lang.String toString()'>
+    <item name='libcore.reflect.AnnotationAccess java.lang.annotation.Annotation[][] getParameterAnnotations(java.lang.reflect.Member)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationFactory A createAnnotation(java.lang.Class&lt;? extends java.lang.annotation.Annotation&gt;, libcore.reflect.AnnotationMember[]) 0'>
@@ -53,16 +50,16 @@
     <item name='libcore.reflect.Types void appendArrayGenericType(java.lang.StringBuilder, java.lang.reflect.Type[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.ListOfTypes java.lang.reflect.Type[] getResolvedTypes()'>
+    <item name='libcore.reflect.Types java.lang.String toString(java.lang.Class&lt;?&gt;[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.GenericArrayTypeImpl java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.Types java.lang.String toString(java.lang.Class&lt;?&gt;[]) 0'>
+    <item name='libcore.reflect.AnnotationAccess A getAnnotation(java.lang.Class&lt;?&gt;, java.lang.Class&lt;A&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.AnnotationAccess A getAnnotation(java.lang.Class&lt;?&gt;, java.lang.Class&lt;A&gt;) 1'>
+    <item name='libcore.reflect.AnnotationAccess java.util.List&lt;java.lang.annotation.Annotation&gt; getDeclaredAnnotations(java.lang.reflect.AnnotatedElement)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.Types void appendTypeName(java.lang.StringBuilder, java.lang.Class&lt;?&gt;) 1'>
@@ -80,15 +77,15 @@
     <item name='libcore.reflect.Types java.lang.reflect.Type[] getClonedTypeArray(libcore.reflect.ListOfTypes) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.Types java.lang.String getSignature(java.lang.Class&lt;?&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.reflect.AnnotationFactory libcore.reflect.AnnotationMember[] getElementsDescription(java.lang.Class&lt;? extends java.lang.annotation.Annotation&gt;)'>
+    <item name='libcore.reflect.ListOfTypes java.lang.reflect.Type[] getResolvedTypes()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationAccess java.lang.Object getDefaultValue(java.lang.reflect.Method) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.reflect.ParameterizedTypeImpl java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.reflect.AnnotationAccess boolean isAnnotationPresent(java.lang.Class&lt;?&gt;, java.lang.Class&lt;? extends java.lang.annotation.Annotation&gt;) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -104,7 +101,10 @@
     <item name='libcore.reflect.AnnotationAccess A getDeclaredAnnotation(java.lang.reflect.AnnotatedElement, java.lang.Class&lt;A&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.AnnotationMember libcore.reflect.AnnotationMember setDefinition(libcore.reflect.AnnotationMember)'>
+    <item name='libcore.reflect.ListOfTypes java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.reflect.Types java.lang.String toString(java.lang.Class&lt;?&gt;[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationAccess java.util.List&lt;java.lang.annotation.Annotation&gt; getDeclaredAnnotations(java.lang.reflect.AnnotatedElement) 0'>
@@ -113,10 +113,7 @@
     <item name='libcore.reflect.AnnotationAccess java.lang.annotation.Annotation[] getAnnotations(java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.AnnotationAccess java.util.List&lt;java.lang.annotation.Annotation&gt; getDeclaredAnnotations(java.lang.reflect.AnnotatedElement)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.reflect.AnnotationAccess java.lang.annotation.Annotation[][] getParameterAnnotations(java.lang.reflect.Member)'>
+    <item name='libcore.reflect.AnnotationFactory java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationAccess java.lang.Class&lt;?&gt;[] getExceptions(java.lang.reflect.AnnotatedElement) 0'>
@@ -125,30 +122,33 @@
     <item name='libcore.reflect.AnnotationAccess int getInnerClassFlags(java.lang.Class&lt;?&gt;, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.AnnotationFactory java.lang.String toString()'>
+    <item name='libcore.reflect.InternalNames java.lang.String getInternalName(java.lang.Class&lt;?&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.reflect.Types java.lang.String getSignature(java.lang.Class&lt;?&gt;)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationAccess java.lang.reflect.AccessibleObject getEnclosingMethodOrConstructor(java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.Types java.lang.String toString(java.lang.Class&lt;?&gt;[])'>
+    <item name='libcore.reflect.InternalNames java.lang.Class&lt;?&gt; getClass(java.lang.ClassLoader, java.lang.String) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationMember java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.InternalNames java.lang.Class&lt;?&gt; getClass(java.lang.ClassLoader, java.lang.String) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.reflect.AnnotationAccess java.lang.String getSignature(java.lang.reflect.AnnotatedElement) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.reflect.ParameterizedTypeImpl java.lang.String toString()'>
+    <item name='libcore.reflect.AnnotationAccess java.lang.Class&lt;?&gt;[] typeIndexToInterfaces(java.lang.Class&lt;?&gt;, com.android.dex.Dex, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.reflect.AnnotationAccess java.lang.Class&lt;?&gt;[] protoIndexToParameters(java.lang.Class&lt;?&gt;, com.android.dex.Dex, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='libcore.reflect.WildcardTypeImpl java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='libcore.reflect.Types void appendTypeName(java.lang.StringBuilder, java.lang.Class&lt;?&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>

android-sdk-annotations/libcore/util/annotations.xml

@@ -1,5 +1,5 @@
 <root>
-    <item name='libcore.util.ZoneInfo java.lang.String toString()'>
+    <item name='libcore.util.CollectionUtils java.lang.Iterable&lt;T&gt; dereferenceIterable(java.lang.Iterable&lt;? extends java.lang.ref.Reference&lt;T&gt;&gt;, boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.util.BasicLruCache V put(K, V) 1'>
@@ -8,16 +8,31 @@
     <item name='libcore.util.BasicLruCache java.util.Map&lt;K,V&gt; snapshot()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.util.BasicLruCache V get(K) 0'>
+    <item name='libcore.util.Objects java.lang.String toString(java.lang.Object) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.util.BasicLruCache V create(K) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.util.BasicLruCache V put(K, V) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.util.ZoneInfoDB.TzData TzData(java.lang.String...) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.util.ZoneInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.util.ZoneInfoDB libcore.util.ZoneInfoDB.TzData getInstance()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.util.ZoneInfo java.util.TimeZone makeTimeZone(java.lang.String, libcore.io.BufferIterator) 1'>
+    <item name='libcore.util.BasicLruCache void entryEvicted(K, V) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.util.Objects java.lang.String toString(java.lang.Object) 0'>
+    <item name='libcore.util.BasicLruCache V get(K) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='libcore.util.ZoneInfo java.util.TimeZone makeTimeZone(java.lang.String, libcore.io.BufferIterator) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='libcore.util.Objects java.lang.String toString(java.lang.Object)'>
@@ -26,15 +41,6 @@
     <item name='libcore.util.ZoneInfo boolean inDaylightTime(java.util.Date) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='libcore.util.BasicLruCache V put(K, V) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.util.CollectionUtils java.lang.Iterable&lt;T&gt; dereferenceIterable(java.lang.Iterable&lt;? extends java.lang.ref.Reference&lt;T&gt;&gt;, boolean)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='libcore.util.ZoneInfoDB.TzData TzData(java.lang.String...) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='libcore.util.CollectionUtils void removeDuplicates(java.util.List&lt;T&gt;, java.util.Comparator&lt;? super T&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>