tree 8081713c8fe49438be420bbc7187234f1d5a684c
parent 7642a2d4343932d4cf7e487984926d928e114617
parent 34337e2078da6ee9eff6d9ed3144e9836eec04f2
author Jay Arthanareeswaran <jarthana@in.ibm.com> 1495447243 +0530
committer Jay Arthanareeswaran <jarthana@in.ibm.com> 1495450749 +0530

Merge branch 'master' into BETA_JAVA9

# Conflicts:
#	org.eclipse.jdt.core.tests.compiler/src/EvalTestsTarget.zip
#	org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java
#	org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java
#	org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java
#	org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java
#	org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NamedMember.java

Change-Id: Ica9e9ccc4ff370554100c545310fba1c66adeed2