| commit | 4ef01c412a68274ab93c2a0292de5ac5894ee00c | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Tue Dec 22 15:36:32 2015 +0100 |
| committer | Yohann Roussel <yroussel@google.com> | Tue Dec 22 15:36:32 2015 +0100 |
| tree | af2008c546adb7687b96d683dd8dac1ebb2db271 | |
| parent | 69942ee538b41df77515c027c8414b4e12d47878 [diff] | |
| parent | 42c42b69713998d851bbdc11d97b28590e3e3bde [diff] |
resolve merge conflicts of 42c42b6971 to master. Change-Id: I40e2d2f7cd3e047bc3bc661f20c7415ce751b321