DESCRIPTION

Avoid NPE on conflict during gerrit checkout

Bug: 511610
Change-Id: Ie1b9de2aed2fbaa255b97a76565c0da417c492e0
Signed-off-by: Jayvion Booth xxx@xxx.xxx


COMMENTS

author: Jayvion Booth
date: 2017-02-03 08:43:44.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2017-02-03 08:43:50.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2017-02-03 09:08:20.000000000

Patch Set 1: Verified+1

Build Successful 

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

-------------------------------------
author: Douglas Trujillo
date: 2017-02-03 22:46:31.000000000

Patch Set 1: Code-Review+2

-------------------------------------
author: Gerrit Johnathan Pham
date: 2017-02-03 22:46:35.000000000

Change has been successfully merged into the git repository by Douglas Trujillo

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