| commit | 6c1149d79903fab49660f2e7a0359cb1e904a3d7 | [log] [tgz] |
|---|---|---|
| author | repo sync <marcone@google.com> | Thu Nov 13 12:35:39 2014 -0800 |
| committer | repo sync <marcone@google.com> | Thu Nov 13 12:35:39 2014 -0800 |
| tree | 88f387970c9ff2f7306a991c3de88a588965c8fb | |
| parent | 4908a30cf92f5c512499a7c45b62b81491de62e5 [diff] | |
| parent | 997a02faf1852b558ae4e6241eb239afde915eeb [diff] |
resolved conflicts for merge of 997a02fa to klp-modular-dev Change-Id: I38ab36a2b38787fbded3090dc1687a4ea6b793ce