| commit | 9b863613454ee139370d24e65adb41fabe75d482 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Thu Apr 14 13:34:36 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Apr 14 13:34:36 2016 +0000 |
| tree | 841cd02509160bbf84f0e057deef4f63c4b68c52 | |
| parent | 5aa4c1c870a29c6ce1d704684137a837e7dd4797 [diff] | |
| parent | ba6aae0b49932a0ae3050d1fc22c6571e51f8180 [diff] |
Merge "Fix initialization of field after conflicting merges."