DESCRIPTION

Do not cherry-pick or revert commit more than once

Alert the user.

The change depends on I67db2b77b52c43932436d22a8daa5a6556423484 in
JGit

Bug: 333814
Change-Id: I6714486c1e703bc22591d966a333e7ffc399539b
Signed-off-by: Juliet Cantu xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2011-01-10 14:01:50.000000000

Uploaded patch set 2.

-------------------------------------
author: Douglas Trujillo
date: 2011-01-10 14:02:20.000000000

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

fixed typos in commit message

-------------------------------------
author: Gerrit Johnathan Pham
date: 2011-01-10 14:02:34.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.

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