| commit | 07de4a6c36b504b5175d9459312a5aa8db8249c6 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Wed Apr 23 18:22:15 2014 -0700 |
| committer | Andrew Lee <anwlee@google.com> | Wed Apr 23 18:22:15 2014 -0700 |
| tree | 3d213c6a2c9ec07c062a8af89a4e5cbebd07410d | |
| parent | 1430d895acbcdc152e17709dec1f356c41b875b3 [diff] | |
| parent | 7e5763d2b5ee7211c5d19d2b1fd2736e407a7e83 [diff] |
resolved conflicts for merge of 7b4cfe59 to master-nova Change-Id: I42b453f23db08952cdbcb17b1bdb199d504e92ef