| commit | 8cac6317c5301ae1235fcb1e1befa4c6ca3ca185 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Fri Jul 25 11:53:48 2014 -0700 |
| committer | Stephen Hines <srhines@google.com> | Fri Jul 25 11:53:48 2014 -0700 |
| tree | 35ee56ef560507ad0971aa0cda0b1656a4808394 | |
| parent | 8b605381493ad3421bb5f91c1b2cb14a22cb14e2 [diff] | |
| parent | 76fb6019feacda82ea3112cb0231860bfd916287 [diff] |
resolved conflicts for merge of 76fb6019 to lmp-dev-plus-aosp Change-Id: Ifc9f9fa95dda1dbe60b3be35ef30d2ca707c72d5