| commit | d1bcd5c86cb3fc9eb263d5daed663e0afc75f3f9 | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Wed Apr 16 10:43:19 2014 -0700 |
| committer | Yorke Lee <yorkelee@google.com> | Wed Apr 16 10:43:19 2014 -0700 |
| tree | b2461ac5c71553a367db91aa9063ba856680ab7b | |
| parent | 24e863804ba2114cd5889620d4222f6068ac5d5d [diff] | |
| parent | e00c9fe163d19ee380b922e3fcbe736216d78ccc [diff] |
resolved conflicts for merge of e00c9fe1 to master-nova Change-Id: I5314095f94fa6af0bbd65de16ea9c1620c947e1d