DESCRIPTION

Fixed merge errors.

Change-Id: I7f34e0b8d488d921babf0e0b0ec4e6b658741a45
Signed-off-by: Genevieve Hudson xxx@xxx.xxx

COMMENTS

author: Genevieve Hudson
date: 2015-06-27 10:14:05.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2015-06-27 10:55:51.000000000

Patch Set 1:

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

-------------------------------------
author: Genevieve Hudson
date: 2015-06-27 11:02:22.000000000

Abandoned

new whole patch will be provided soon...

-------------------------------------
author: Brenden Conley
date: 2015-06-27 11:12:14.000000000

Patch Set 1:

Build Successful 

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

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