| commit | b8fb783287276c969dabde8e8e09cdd2b92d27fc | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Tue Apr 15 12:05:22 2014 -0700 |
| committer | Yorke Lee <yorkelee@google.com> | Tue Apr 15 12:05:22 2014 -0700 |
| tree | fdb635477a01beadb8e92c2fb4cca2e647dcaa8b | |
| parent | c8a9db7120e7a1b5f5be35798b6bb13d1099edf9 [diff] | |
| parent | 86e21f733049560e77b92f17a58474312d72ec3e [diff] |
resolved conflicts for merge of 86e21f73 to master-nova Change-Id: Idcacd44a253d227a05704641bc9faa2c77106885