| commit | f3ad8102d2762c67598283f32afe6154d5ad3798 | [log] [tgz] |
|---|---|---|
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | Tue Nov 17 13:57:47 2015 +0000 |
| committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | Tue Nov 17 13:57:47 2015 +0000 |
| tree | 79476991922397abf6546caa7f3349ca75597c88 | |
| parent | 8ea3f1631043cc9381b5f07220b199feeec6a02f [diff] | |
| parent | c6b8e2367fde6406ba2954797c8217f257ddeb23 [diff] |
resolve merge conflicts of c6b8e2367f to mnc-enso-dev. Change-Id: Ic2205c4344148cccae934b8f31656fd05cd1925c