DESCRIPTION

Remove a forgotten merge marker

Change-Id: Iba9e89fd523fab922d51eddf17855547ea94d260
Signed-off-by: Juliet Cantu xxx@xxx.xxx


COMMENTS

author: Yoselin Hanna
date: 2010-04-16 22:59:08.000000000

Patch Set 1: Looks good to me, approved; IP review completed



-------------------------------------
author: Yoselin Hanna
date: 2010-04-16 22:59:17.000000000

Change has been successfully merged into the git repository.

-------------------------------------
author: Juliet Cantu
date: 2010-04-16 23:01:09.000000000

Patch Set 1:

That was one quick review :)

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