DESCRIPTION

Correct grammatical error in unable to merge message

Change-Id: I4d719fc69599eae7f8f8fd9e88394fe8ae2208f1
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Gerrit Johnathan Pham
date: 2011-11-29 14:48:05.000000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

-------------------------------------
author: Douglas Trujillo
date: 2011-11-29 14:51:09.000000000

Uploaded patch set 2.

-------------------------------------
author: Douglas Trujillo
date: 2011-11-29 14:51:36.000000000

Patch Set 2: Looks good to me, approved; Build Successful; IP review completed

rebased

-------------------------------------
author: Douglas Trujillo
date: 2011-11-29 14:51:37.000000000

Change has been successfully merged into the git repository.

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