| commit | 18aa7840e17473544a80205367435e9c2e8b7527 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Fri Aug 22 17:08:39 2014 -0700 |
| committer | Stephen Hines <srhines@google.com> | Fri Aug 22 17:08:39 2014 -0700 |
| tree | c11d4f4977b8e167bda22c980f8a34237f918140 | |
| parent | 6ca06f3f9ed8807b37e592790e09041f36a0f284 [diff] | |
| parent | 1870c0718729ef8968b2264c329c0351f6ba5de6 [diff] |
resolved conflicts for merge of 1870c071 to lmp-dev-plus-aosp Change-Id: I4daede2c850ef9c58980c9191c2a8b837e427171