| commit | 7379316700cab1863456ab8b0049058f34c2c569 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Fri Mar 14 14:41:05 2014 -0700 |
| committer | Jeff Hao <jeffhao@google.com> | Fri Mar 14 14:41:05 2014 -0700 |
| tree | 767a8ac75ec0e5c394e1f8e792ebdf002a03bb98 | |
| parent | 6ab9ca446390f64542dbbc0a81771cb5c767ec05 [diff] | |
| parent | 773965c0168c5bd19d727ddb950c74382dcb9fa4 [diff] |
resolved conflicts for merge of 773965c0 to klp-modular-dev Change-Id: I3ce665797ef01dd09e0dd0040299bc299b5dd999