| commit | e1adef679f0e1915bf706def02f0808fc1c1c362 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Oct 06 14:58:08 2015 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Tue Oct 06 14:58:08 2015 -0700 |
| tree | c44d401c297fb81b71a7e1f11a6917aae214d425 | |
| parent | 09878a6d0581f6e49c4ee481ddc798961198dbcd [diff] | |
| parent | 198446e81eaddf8a57d0ac809569ae26dd5ceaeb [diff] |
resolved conflicts for 198446e8 to master Change-Id: I927b2ba54307937bf09c9784deaa0c3a20bf89f4