| commit | bbc6a46ddb6c47cade3cdd8a9182d974db9540f7 | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Wed Apr 23 14:58:47 2014 -0700 |
| committer | Yorke Lee <yorkelee@google.com> | Wed Apr 23 14:58:47 2014 -0700 |
| tree | 5c5ef2124482eb0f98ce0210164c3fdcf8d40589 | |
| parent | f6dde6eabc1b3728602546557dcd3b6be2c86b23 [diff] | |
| parent | eb1df8edf78899a6666bc460a3e170fa0b9d6d14 [diff] |
resolved conflicts for merge of eb1df8ed to master-nova Change-Id: I337b0429f68479942b0143caa8fb26d2f91923e9