| commit | f236d7ffadd918a2a50f7cbd04349ad2222644b7 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Oct 01 12:14:03 2015 +0100 |
| committer | Sergio Giro <sgiro@google.com> | Thu Oct 01 11:19:34 2015 +0000 |
| tree | 8ae575dfa5b531898dc3a10170a40a1769dff03d | |
| parent | f8f9c10247b32c0075f0e0e30c1f38d7a61a030d [diff] | |
| parent | 31e5ded687bd5307bc614d6ec0a56888b98a0306 [diff] |
resolved conflicts for 31e5ded6 to master Change-Id: Iae4e1abe697f1c00a82b54c17afa7d4edddc006b