| commit | e466d223b66a28e22f5742a45ab6cf5ad643a1ee | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Mon Mar 17 13:44:53 2014 -0700 |
| committer | Jeff Hao <jeffhao@google.com> | Mon Mar 17 13:44:53 2014 -0700 |
| tree | 464c4640f85ebea0fcaaa740efe4ef7dff2461dd | |
| parent | 5dbae316c915565a072c69cc6d72817910ae4c75 [diff] | |
| parent | 36e356c96640775f0a3f167bd2426ea0f0093b8b [diff] |
resolved conflicts for merge of 36e356c9 to klp-modular-dev Change-Id: Ic1333a5213b015fe8d3892050fada5a969f7678c