| commit | 6ab9ca446390f64542dbbc0a81771cb5c767ec05 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Fri Mar 14 14:38:02 2014 -0700 |
| committer | Jeff Hao <jeffhao@google.com> | Fri Mar 14 14:38:02 2014 -0700 |
| tree | 767a8ac75ec0e5c394e1f8e792ebdf002a03bb98 | |
| parent | e28aef71edded3fc1976eeb83ea3a3a787683af7 [diff] | |
| parent | 53fca11882e634b67aca4f112585413a1918b5ad [diff] |
resolved conflicts for merge of 53fca118 to klp-modular-dev Change-Id: Idc4259266d5239a4462637e1792db3234d20608e