| commit | e27002d77fc35257f88f1ca0c8f7d444924c1478 | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@google.com> | Thu Oct 02 10:19:12 2014 -0700 |
| committer | Glenn Kasten <gkasten@google.com> | Thu Oct 02 10:19:12 2014 -0700 |
| tree | 981fac0b9d7464b42973bfb2c05c592e2efc9667 | |
| parent | e4a091bb823f122f7f72c8af57e571dfe06edbf1 [diff] | |
| parent | 1c92912bcb3e689dd843e7b6a5de9af4d82bd2be [diff] |
resolved conflicts for merge of 1c92912b to lmp-dev-plus-aosp Change-Id: I5a57218e81dff86f46af7067d47f7af816e2d12c