| commit | eb10ccbc9dcab8ec3ee22a1c2b2db4a673c6fdc2 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 11:29:58 2015 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Thu Aug 20 11:29:58 2015 -0700 |
| tree | ae30f2a2cb0aa4aac6be286d42f30d6d97b32c79 | |
| parent | d7c205fe1f7cda2cdcb3062b548c0777402bab38 [diff] | |
| parent | 8a064aa83ad590b61ddd84e678c59f0d1f68106c [diff] |
resolved conflicts for merge of 8a064aa8 to klp-modular-dev Change-Id: If031955c9edca657401831fbfa5a128f0b4c6d86