# Conflicts:
#	org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/CompilerInvocationTests.java
#	org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ModuleBuilderTests.java
#	org.eclipse.jdt.core/.settings/.api_filters

Change-Id: I7351312d837aae17f871e39eb1011055c6ca991a