| commit | 2a805f930463ece57bc0d0fd8dee7f5d50681b22 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Jul 31 18:25:47 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Jul 31 18:25:47 2013 -0700 |
| tree | dec32c8b28d1206de168112a33c8503026ef7fd7 | |
| parent | bf83e0dd12ec0cf9e46359f0bc837a562a12a375 [diff] | |
| parent | 368d81fe185ed4484e3258a160416e6567896e31 [diff] |
resolved conflicts for merge of 368d81fe to master Change-Id: I4bc59cd9a54cbc1b62ac135cf86dc73ac85968d5