| commit | ba6aae0b49932a0ae3050d1fc22c6571e51f8180 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Thu Apr 14 14:17:29 2016 +0100 |
| committer | Nicolas Geoffray <ngeoffray@google.com> | Thu Apr 14 14:17:29 2016 +0100 |
| tree | 841cd02509160bbf84f0e057deef4f63c4b68c52 | |
| parent | 5aa4c1c870a29c6ce1d704684137a837e7dd4797 [diff] |
Fix initialization of field after conflicting merges. Change-Id: I5c887d5cbcd94f51c3566e964d217a906dbaa9ea