| commit | 69f68120b94cecb2d87fe856bc115714b4e77bcd | [log] [tgz] |
|---|---|---|
| author | Shishir Agrawal <shishir@google.com> | Mon Dec 16 17:25:49 2013 -0800 |
| committer | Shishir Agrawal <shishir@google.com> | Mon Dec 16 17:34:33 2013 -0800 |
| tree | 1eb856dd998629e481a4b265b89f78afcde83031 | |
| parent | 7738f27d273e9da918fb8c32962625e943fc08c3 [diff] | |
| parent | d50129c82144e1eace11596e1ea4e2e5c0eab368 [diff] |
resolved conflicts for merge of d50129c8 to master-nova Change-Id: I5598068713c0cc33c2a281928ccfc57c71839d59