| commit | d7ffdab9dbd6cb10cf45fa841c7f9e8e406133bb | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Apr 30 12:02:54 2014 -0700 |
| committer | Kenny Root <kroot@google.com> | Wed Apr 30 12:02:54 2014 -0700 |
| tree | 5635b111ee5947b9d3b2343f795b7b6efb6248dc | |
| parent | d434a6072462b8ba01a41f9febdaabc383e0e31e [diff] | |
| parent | 45cd6f51ff8dc1ecadbb7abc5a979502b07b05a9 [diff] |
resolved conflicts for merge of 45cd6f51 to klp-modular-dev Change-Id: Ic2f144d268c8b10eb9628b695ea95003cf40aac2