diff -r 099641abfb05 -r 1bbdff43424d langtools/test/tools/javac/conditional/Conditional.out
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/conditional/Conditional.out	Fri May 15 01:56:14 2015 -0700
@@ -0,0 +1,4 @@
+- compiler.warn.source.no.bootclasspath: 1.7
+Conditional.java:16:38: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.util.List<? extends java.lang.Object>, java.util.List<java.lang.String>)
+1 error
+1 warning