| commit | 3bb3da96ae60f6e1f1a9fef32c428a92b104c2cd | [log] [tgz] |
|---|---|---|
| author | Takeshi Hagikura <thagikura@google.com> | Fri Oct 24 10:34:53 2014 +0900 |
| committer | Takeshi Hagikura <thagikura@google.com> | Fri Oct 24 01:39:19 2014 +0000 |
| tree | 53965f67a6cc18d721f688c14b9a3c08e8736995 | |
| parent | 9875ec66e188cbcced9d4cc3334af7846b809587 [diff] | |
| parent | 11e09fc0577acac0f4cad59489fdd8cb6bddd9f1 [diff] |
resolved conflicts for merge of 11e09fc0 to klp-modular-dev Extracted the diff for those files between klp-modular-docs and klp-modular-dev in case https://paste.googleplex.com/5232937083600896 Change-Id: I94950ba66f15b75c1ead60e9f6b38b67e4fa9d6e