| commit | 2cf184233ba5a596a4fc187289bba848ff341cf1 | [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 | 49fe7265d047a5fa52b36e6c93a513e69f8ed885 | |
| parent | 92ddeeab47c9c98454df725275764e708025615f [diff] | |
| parent | aab03030bea37b0180044a2b9653324066070598 [diff] |
merge master nova by hand, skipped translations Change-Id: I4bea0bb9e375361f21d995bf4698d5eb6300ecfb