| commit | feb92f45da611a35e9a08e65d0ee1d6ee7f7b3d6 | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Thu Nov 21 14:38:08 2013 -0800 |
| committer | Evan Charlton <evanc@google.com> | Thu Nov 21 14:38:08 2013 -0800 |
| tree | 7bfa98922c9a6d889064983adb0d1a3f4f98cb2b | |
| parent | 6afabd7a8515ca9266fb321bdd17e58c0f08f573 [diff] | |
| parent | 598dac56af25319ec4aa0f2a5d98adfc023d7ac4 [diff] |
resolved conflicts for merge of 598dac56 to master-nova Change-Id: I963572a13f5204a876640193ea00b5ed69162d4b