Merge
authorlana
Thu, 21 May 2015 16:19:29 -0700
changeset 30734 271924202c97
parent 30712 6833a5c6781c (diff)
parent 30733 f4b21d02e886 (current diff)
child 30735 11b2581a067e
Merge
langtools/test/tools/javac/5005368.java
langtools/test/tools/javac/generics/InterfaceCast1.java
langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes1.java
langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes2.java
langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes3.java
langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes4.java
langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes5.java
langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes6.java
langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes7.java
langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes8.java
langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes9.java
langtools/test/tools/javac/generics/wildcards/AssignmentSameType1.java
langtools/test/tools/javac/generics/wildcards/AssignmentSameType2.java
langtools/test/tools/javac/generics/wildcards/AssignmentSameType3.java
langtools/test/tools/javac/generics/wildcards/AssignmentSameType4.java
langtools/test/tools/javac/generics/wildcards/AssignmentSameType5.java
langtools/test/tools/javac/generics/wildcards/AssignmentSameType6.java
langtools/test/tools/javac/generics/wildcards/AssignmentSameType7.java
langtools/test/tools/javac/generics/wildcards/AssignmentSameType8.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail1.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail10.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail11.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail12.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail13.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail14.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail15.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail16.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail17.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail18.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail19.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail2.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail20.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail21.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail3.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail4.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail5.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail6.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail7.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail8.java
langtools/test/tools/javac/generics/wildcards/neg/CastFail9.java
langtools/test/tools/javac/generics/wildcards/neg/CastWarn10.java
langtools/test/tools/javac/generics/wildcards/neg/CastWarn11.java
langtools/test/tools/javac/generics/wildcards/neg/CastWarn12.java
langtools/test/tools/javac/generics/wildcards/neg/CastWarn13.java
langtools/test/tools/javac/generics/wildcards/neg/CastWarn14.java
langtools/test/tools/javac/generics/wildcards/neg/CastWarn2.java
langtools/test/tools/javac/generics/wildcards/neg/CastWarn3.java
langtools/test/tools/javac/generics/wildcards/neg/CastWarn4.java
langtools/test/tools/javac/generics/wildcards/neg/CastWarn5.java
langtools/test/tools/javac/generics/wildcards/neg/CastWarn6.java
langtools/test/tools/javac/generics/wildcards/neg/CastWarn7.java
langtools/test/tools/javac/generics/wildcards/neg/CastWarn8.java
langtools/test/tools/javac/generics/wildcards/neg/CastWarn9.java
--- a/langtools/.hgtags	Thu May 21 13:48:23 2015 -0700
+++ b/langtools/.hgtags	Thu May 21 16:19:29 2015 -0700
@@ -307,3 +307,4 @@
 40058141a4ec04a3d4cacdb693ad188a5ddf48ed jdk9-b62
 a28b7f42dae9bd59513beaa5a2d6eb563dc09e08 jdk9-b63
 809d66512998789b620d08c335d7c31211a0cf29 jdk9-b64
+4fcf722b811406a7db8f206d88446c82cda1b5f4 jdk9-b65