| commit | 3007c46bc326912cba58af556b7dbeb0a3994da0 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Feb 16 03:31:19 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Feb 16 03:31:19 2018 +0000 |
| tree | 66d7f9e9d5a4e82251186f952df5fd536fd7447b | |
| parent | b96c5ae37b3776ac85d8b6c7a4c81adb10b62b99 [diff] | |
| parent | c655dec0b00fb137143ff55878f501f7a895297f [diff] |
Merge "Fix comment on conflict policy"