| commit | 4a043c1853c117c1b4c4342e76cd16a5abdc1045 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Aug 21 23:20:32 2014 -0700 |
| committer | Stephen Hines <srhines@google.com> | Thu Aug 21 23:20:32 2014 -0700 |
| tree | 3a9e45a9d25e47e46e6158f2aa27574827178a1a | |
| parent | 304eaeed8b7aa11d69e62073f7d6c4830a85e02b [diff] | |
| parent | 5a2d043274bc06c016cd563b2d7920a910b8129c [diff] |
resolved conflicts for merge of 5a2d0432 to lmp-dev-plus-aosp Change-Id: I59be35e67ab2b4709f27c39916b6aebc1abba56f