DESCRIPTION

Add wording in merge dialogue indicating merge direction

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


COMMENTS

author: Juliet Cantu
date: 2011-01-09 16:54:28.000000000

Uploaded patch set 4.

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