| commit | 4167d7e5c23b3b3056107b18bae7a871cf974414 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Jan 13 18:12:04 2014 -0800 |
| committer | Christopher Ferris <cferris@google.com> | Mon Jan 13 18:14:11 2014 -0800 |
| tree | 1ddbe300520347c445ca21c3889fa1bafb6299bc | |
| parent | da1f43f0753ef1d3f01e5eaf01280ef611f4abfb [diff] | |
| parent | 8791ee5c1486c9d6f9bf275bb096179dce95f309 [diff] |
resolved conflicts for merge of 8791ee5c to master Change-Id: I107bb055941809331c451c1d903f231f07a86ece