| commit | d5fdded86912e9c6a3b28034803989656e9a80ad | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Oct 23 12:28:31 2013 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Wed Oct 23 12:28:31 2013 -0700 |
| tree | 6c6173f384a0f3ad839c1bcf49d0e08233cb5721 | |
| parent | 0677854f30ae982df77c2c09d98998c2a7181688 [diff] | |
| parent | d8eb423a1088b53a5a3b31e7e78fb095d8100c9d [diff] |
resolved conflicts for merge of d8eb423a to klp-dev Change-Id: I44c7c7d0e1da8fd169a0bf57696e308631fa9f25