| commit | ab8f4f89dd9a7805f57aff3884b7de1c34694634 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 09:59:53 2014 +0900 |
| committer | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 09:59:53 2014 +0900 |
| tree | fb9d6c44a19c0e8d5aad5322f869f16e5f11a720 | |
| parent | 6522fccd3d186c2d4fb479e6626d9f1ab8dc45ba [diff] | |
| parent | c2549b4b4e2437aca29497c29ebe0b17b6214549 [diff] |
resolved conflicts for merge of c2549b4b to klp-modular-dev Change-Id: Ic42c011544f9b0438637f980749c8182214615fd