| commit | a500fef663b5f0ac732faa8ba33777163f6a635d | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Thu Oct 15 17:59:11 2015 +0900 |
| committer | Wonsik Kim <wonsik@google.com> | Thu Oct 15 17:59:11 2015 +0900 |
| tree | 0d6619a7bac075e95b164c2535a6821507bbc2a2 | |
| parent | af1738981f6169b519daed83ed7f1a0e91325370 [diff] | |
| parent | b6679faff868811e003439cd8be8940646774d50 [diff] |
resolved conflicts for b6679faf to klp-modular-dev Change-Id: I5f09091a2c96437a3301fa2edb5793a55ac2af8b