| commit | ee1400fb6565bfba2d3ccd5f66852986833b9c7b | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Thu Mar 13 11:10:28 2014 -0700 |
| committer | Mathieu Chartier <mathieuc@google.com> | Thu Mar 13 11:10:28 2014 -0700 |
| tree | 767a8ac75ec0e5c394e1f8e792ebdf002a03bb98 | |
| parent | d6bd654b9acb090897ed7a75283d22372d3003b1 [diff] | |
| parent | 0c6afa40af7b9f097131126d084d5f19c2accaac [diff] |
resolved conflicts for merge of 0c6afa40 to klp-modular-dev Change-Id: Ia8cf44f96f805e18407d77128be4543f868cefba