| commit | 97742073ca1e7bf1a98b43a83142e8e850e57d3e | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Jul 21 14:49:27 2014 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Mon Jul 21 14:49:27 2014 +0100 |
| tree | 6079edee872b2d7da9237931bb4756b4ddbe268d | |
| parent | bf37ff6b9293a3d062ab75ac94376b49ab85630a [diff] | |
| parent | 5554c0c071af062dba8cb0f4f83d74c94f43676a [diff] |
resolved conflicts for merge of 5554c0c0 to lmp-dev-plus-aosp Change-Id: Ic07d4f265d58c7a56da2aeabb1c8007950e6f3fc