| commit | 8402b73b4a73cdf31484256fbc24d3659d6d5f97 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Jun 18 12:42:09 2014 -0700 |
| committer | Jeff Davidson <jpd@google.com> | Wed Jun 18 12:42:09 2014 -0700 |
| tree | 9630d2d7caceea0d1e972eeca0e78b022459b447 | |
| parent | fd921e20cdf7ba4b28318954d5b6aef5d3d8d30e [diff] | |
| parent | 84faec58c451a6e317eb8c1621493fc530e5dbcc [diff] |
resolved conflicts for merge of 84faec58 to klp-modular-dev