| commit | 59cf734f9ee8fa0154d199f0f36779a6ffe0dfb5 | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Thu Dec 11 11:10:50 2014 +0100 |
| committer | Yohann Roussel <yroussel@google.com> | Thu Dec 11 11:10:50 2014 +0100 |
| tree | c57440c0cbe027e40c20e0ff9c233c45ca5c721e | |
| parent | 9f2d0d27ac2e30d641e26775761e2909fa863f9a [diff] | |
| parent | d67bb5015f716c094beff02b2c5e77c9bb7d11a0 [diff] |
resolved conflicts for merge of d67bb501 to master Change-Id: I40698ce1e382cb41eec7af5ea49ac0e2f997d555