tree 6b07be5ad4e0b4655cf649174554c99fd0fb9471
parent 5cefcbfc68a8d7b49d1d98d36c5dfbb09de28923
parent 9dff074c73ba59f17d8e0430cae04b5a6d1ac32c
author Shawn Pearce <sop@google.com> 1384835868 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1384835868 +0000

Merge "Fix updating changes that fail to merge" into stable-2.8