| commit | 093789755e5549bd8676d268a6f69b1d6db5026b | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Wed Dec 10 10:42:08 2014 -0800 |
| committer | Eric Laurent <elaurent@google.com> | Wed Dec 10 10:42:08 2014 -0800 |
| tree | ab2c0f9ae33cfbc521489040fdbfc65bd18e205c | |
| parent | 93c5cf6a6fc928dbfd4426b7bd0c7731bfac0ed2 [diff] | |
| parent | 5196dd04a09cf3779e7354b9808c875202c615b7 [diff] |
resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp Change-Id: I34063a9a516e0d9d209d3176279ef4266b6a113d