| commit | 2fc798a2270cda98366776af489d45c1043e831d | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Apr 01 13:57:37 2014 -0700 |
| committer | Craig Mautner <cmautner@google.com> | Tue Apr 01 13:57:37 2014 -0700 |
| tree | d07a9e7ad1bd2518e1e19549943cfe14fa09173a | |
| parent | dc5e02bdccbbc60ede21ae706f06c696b6983812 [diff] | |
| parent | 8c6e6e7372f26e87b56debc1177debfa4971c00b [diff] |
resolved conflicts for merge of 8c6e6e73 to klp-dev Change-Id: I9fc9bc3d935e9e730ebca767d848b1c66203f3b4