commit 3a6411ec91b24e73f36301d0075bc7b052894ae9
author Yi Kong <yikong@google.com> Tue Jun 14 11:25:41 2016 +0100
committer Yi Kong <yikong@google.com> Tue Jun 14 13:38:59 2016 +0100
tree 60cf2670b01a2f7460e03453e95854a4ab4d2692
parent eba5eddf5cb1c4c56d6fe674e5da18f47ade30aa

Merge OpenJDK 8 java.net (part 1)

Partial import of upstream jdk8u60 that does not introduce behavioural
differences:
 * Various documentation fixes
 * Change HTML <code> and <tt> to {@code} annotation.
 * Generics
 * Serialization UID
 * Code layout

No functional change.

Bug: 29067535
Change-Id: I7fc29692b949a27b528d1b25dfb3f0993005dfd2

openjdk_java_files.mk

diff --git a/openjdk_java_files.mk b/openjdk_java_files.mk
index d71e9fe..fba2e73 100644
--- a/openjdk_java_files.mk
+++ b/openjdk_java_files.mk
@@ -100,6 +100,7 @@
     ojluni/src/main/java/java/lang/annotation/ElementType.java \
     ojluni/src/main/java/java/lang/annotation/IncompleteAnnotationException.java \
     ojluni/src/main/java/java/lang/annotation/Inherited.java \
+    ojluni/src/main/java/java/lang/annotation/Native.java \
     ojluni/src/main/java/java/lang/annotation/Retention.java \
     ojluni/src/main/java/java/lang/annotation/Repeatable.java \
     ojluni/src/main/java/java/lang/annotation/RetentionPolicy.java \
@@ -310,6 +311,7 @@
     ojluni/src/main/java/java/net/URL.java \
     ojluni/src/main/java/java/net/URLStreamHandlerFactory.java \
     ojluni/src/main/java/java/net/URLStreamHandler.java \
+    ojluni/src/main/java/java/net/package-info.java \
     ojluni/src/main/java/java/nio/Bits.java \
     ojluni/src/main/java/java/nio/Buffer.java \
     ojluni/src/main/java/java/nio/BufferOverflowException.java \