| commit | dff75073d4652a03572ef5d5b026202396cea326 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Oct 03 17:38:48 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Oct 03 17:38:48 2014 -0700 |
| tree | 12e50eb44aba15b19253c48eb58fcfc0f95ec898 | |
| parent | 400297b874a12b0f5949e901054314b7188f4fb0 [diff] | |
| parent | 9f22aef0c9d7d1bd9aecad7ed6e047ea78d3f7c8 [diff] |
resolved conflicts for merge of 9f22aef0 to master Change-Id: I81f49dacc90f0f6ef3ce7b20fe88e543b383aec8