| commit | bbc7ca24da2470619d5e4aa9e59435865d535d4f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Apr 15 12:15:00 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Apr 15 12:15:00 2015 -0700 |
| tree | 8d00fe12edae5611eab5b10375c529d848a421d0 | |
| parent | f7842079cd3df93dc22ff315d95414b2f92a4c18 [diff] | |
| parent | 6e9b28b2ea32cbff77581cf76af2486bef06e63b [diff] |
resolved conflicts for merge of 6e9b28b2 to master Change-Id: Icd1bbc33283c504691934256a4cf5989868d3caf