| commit | 94a20a2efd790cdff45e52d7c92b6cb525301787 | [log] [tgz] |
|---|---|---|
| author | Benjamin Franz <bfranz@google.com> | Mon Jun 29 17:39:31 2015 +0100 |
| committer | Benjamin Franz <bfranz@google.com> | Mon Jun 29 17:39:31 2015 +0100 |
| tree | 94a6e55bb1b92164376c6f33e03660f2b1a7d2cb | |
| parent | bf176e75a8e796bd5558f8d433491d8607e44b6b [diff] | |
| parent | 31706d99218ff63909f9949c47159c033f2e476d [diff] |
resolved conflicts for merge of 31706d99 to master Change-Id: Ic3acad0d2d82ff8f0e5d31d3490c009d242d860b