DESCRIPTION

Add wording in merge dialogue indicating merge direction

Bug: 333480
Change-Id: Id2dd5e87a3528591068ee08227abd635b6a3220b
Signed-off-by: Juliet Cantu xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2011-01-09 23:05:18.000000000

Uploaded patch set 5.

-------------------------------------
author: Douglas Trujillo
date: 2011-01-09 23:06:44.000000000

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

- rebased to current master

-------------------------------------
author: Douglas Trujillo
date: 2011-01-09 23:08:51.000000000

Change has been successfully merged into the git repository.

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