| commit | 21ca798137c8c065c8cdaa30a08ff05003f3b50f | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Wed Sep 23 22:03:30 2015 +0100 |
| committer | Sergio Giro <sgiro@google.com> | Wed Sep 23 22:03:30 2015 +0100 |
| tree | 5f4d5774e16fb8e141741afda40601f799b3cbf8 | |
| parent | e8356efcbb658e3c84571b242726caa8fede32d2 [diff] | |
| parent | 8dba9a7bf1322f4cf60509131f13c8eac657ae63 [diff] |
resolved conflicts for 8dba9a7b to master Change-Id: I314e3fc4dffbff1f7030533a821696692d03b33d