| commit | 850b26001fc983d7cdba9c33e39e9542c065190f | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Wed May 14 13:24:53 2014 -0700 |
| committer | Ed Heyl <edheyl@google.com> | Wed May 14 13:24:53 2014 -0700 |
| tree | 3c3f38ad65f7f3ac1482a392df408628a6c7e466 | |
| parent | f8c1b37523314912e5906a8606a509702b2ca534 [diff] | |
| parent | f5193f41e483ec012d63f1a52198d80031d2aa52 [diff] |
merge master nova by hand, skipped translations Change-Id: I4bea0bb9e375361f21d995bf4698d5eb6300ecfb