| commit | c5a1c1363c87f5168e9c143575cc43c7332dffa8 | [log] [tgz] |
|---|---|---|
| author | Ricardo Cervera <rcervera@google.com> | Tue Jan 06 16:31:37 2015 -0800 |
| committer | Ricardo Cervera <rcervera@google.com> | Tue Jan 06 16:31:37 2015 -0800 |
| tree | 5174f30e521c2c2a650e85d0302922a003ba2e25 | |
| parent | 70f52f6a1dab0de50e1319a40ce66c70cb78c43b [diff] | |
| parent | 6302a72a8d9f3ce53d87c78b24048bc0787547cf [diff] |
resolved conflicts for merge of 6302a72a to master Change-Id: I3adbbb983a2d7b0b85d3de0b14cbb2619aa711dd