| commit | 0917d142789db4a387fd9f30d7515736c060cb8b | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Wed May 07 15:34:12 2014 -0700 |
| committer | Evan Charlton <evanc@google.com> | Wed May 07 16:33:30 2014 -0700 |
| tree | fb7152a8e5f16b4b933044a8ae14f79472928e01 | |
| parent | 928866774981c8708267e3fa4f5f0c34b1bada39 [diff] | |
| parent | 943e903eadd286c5ee309f33e8bebbf7e516d8fe [diff] |
resolved conflicts for merge of d4a1d2e5 to master-nova Change-Id: I0b78644dfee1ee9d6cc8627bd480858361cfae43