| commit | 5c016d75f103b5ab15d0ae1a9b665e4ef50b94cf | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Oct 01 20:21:56 2015 +0100 |
| committer | Sergio Giro <sgiro@google.com> | Thu Oct 01 20:21:56 2015 +0100 |
| tree | 9abedec649511eb3b398db2b5ab75c1c2e722e85 | |
| parent | 76414a8a77fdf4a2217f36cebbe953bf9e7c0972 [diff] | |
| parent | 345c173f4d96ed8fbfcb04ca11e1fcac764c44f2 [diff] |
resolved conflicts for 075f690d to master Change-Id: I35b870a1e43b9a4b9f09ecabee68c54f993b036f