| commit | 7aeed262139b72b7eb698f215f4a120521b1c9eb | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Tue Nov 19 04:37:48 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Nov 19 04:37:48 2013 +0000 |
| tree | 6b07be5ad4e0b4655cf649174554c99fd0fb9471 | |
| parent | 5cefcbfc68a8d7b49d1d98d36c5dfbb09de28923 [diff] | |
| parent | 9dff074c73ba59f17d8e0430cae04b5a6d1ac32c [diff] |
Merge "Fix updating changes that fail to merge" into stable-2.8