| commit | b40272f7fc4c1b4310e6cc7097228f64a140860a | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Mon Jul 14 19:12:22 2014 -0700 |
| committer | Chris Craik <ccraik@google.com> | Mon Jul 14 19:12:22 2014 -0700 |
| tree | b5c676f5b6032c318e42fb841f9239cc2cc2e4fb | |
| parent | 038a1d8fa7c60037a118f59fddfdf67aadba2678 [diff] | |
| parent | 1f055f700a55f6cfe023b080f5217fe0dab79f7e [diff] |
resolved conflicts for merge of 1f055f70 to klp-modular-dev Change-Id: I8a64416ee19c89535bf96aec943b28673f03aa0e