tree 7300596f14416472836659d8dc75500250e0a965
parent 49eef728fd5a9e88ec2ecd8ea26b72d04766042b
parent ef8f1cacdc6a250a0a3da275d0845b3e67f9c0de
author Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com> 1606286927 +0530
committer Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com> 1606286927 +0530

Merge branch 'master' into BETA_JAVA16

Conflicts:
	org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestPreview.java

Change-Id: If464dd4b24d93bf368b327b511ec77e66dcc97dc
Signed-off-by: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>