| commit | 67ef399634024ff971a6ab0cdc18c2a1bed74d02 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Wed Feb 18 23:18:16 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Feb 18 23:18:17 2015 +0000 |
| tree | 008dae76e8b61eb76b02eee2fd1b7a84cf1019fb | |
| parent | 2ecf23c68a55245ef26e570e989abf2d0d09f8e9 [diff] | |
| parent | 8cbf929a206894fe6965629b05bf436a4cd41f22 [diff] |
Merge changes from topic 'cherrypick' * changes: CherryPick: Keep going in the face of a single merge conflict CherryPick: Test for submitting a subset of dependent changes