DESCRIPTION

Merge branch 'stable-4.6'

* stable-4.6:
  Avoid NPE on conflict during gerrit checkout

Change-Id: I0de520a2d317b679b68f190f8b1a1d9e218e045b
Signed-off-by: Elise Key xxx@xxx.xxx


COMMENTS

author: Elise Key
date: 2017-03-07 04:40:33.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2017-03-07 04:40:40.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/9637/

-------------------------------------
author: Brenden Conley
date: 2017-03-07 05:03:40.000000000

Patch Set 1: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/9637/ : SUCCESS

-------------------------------------
author: Elise Key
date: 2017-03-07 09:32:16.000000000

Patch Set 1: Code-Review-1

This will need to be re-done; there have been other changes merged on stable-4.6 in the meantime.

-------------------------------------
author: Douglas Trujillo
date: 2017-03-07 09:34:36.000000000

Patch Set 1:

> This will need to be re-done; there have been other changes merged
 > on stable-4.6 in the meantime.

I will merge stable-4.6 branches as soon as I have released 4.6.1 later today

-------------------------------------
author: Elise Key
date: 2017-03-07 10:07:35.000000000

Abandoned

-------------------------------------
