DESCRIPTION

Replace 'OK' with 'Cancel' on 'Checkout Conflicts' dialog

Bug: 394682
Change-Id: I96c8bcc917eb51251bdac95547b3c038ebbc2259
Signed-off-by: Douglas Trujillo xxx@xxx.xxx


COMMENTS

author: Douglas Trujillo
date: 2012-12-09 09:48:59.000000000

Uploaded patch set 2.

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