| commit | 9e9d1e016faf12c4bc5454ce16e20f7db693a72d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 08 18:08:33 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Aug 08 18:08:33 2013 -0700 |
| tree | 032a162a2248b2fc0be232afc9b9666747a1e5dd | |
| parent | ceb670cfc09e407a30627d5044f45d5e28e1be5d [diff] | |
| parent | 86125acacd0f06f8523917e6d94e8cd3d7a4aca2 [diff] |
resolved conflicts for merge of 86125aca to klp-dev Change-Id: I78622ecbad27301b285193a085fa04374aa60033