| commit | 479eca858c85fb0a6cfa073012dba1dee6906030 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Aug 04 12:21:46 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Mon Aug 04 12:21:46 2014 -0700 |
| tree | a1d3b7b75318e033c6f89cd2be395f5f50e2f9f9 | |
| parent | 70c6e14492e137bcde20d2a20c0e98a830a81fcb [diff] | |
| parent | 9b80095e6c9f44bc9d6751807c9d7d5ca940c281 [diff] |
resolved conflicts for merge of 9b80095e to lmp-dev-plus-aosp Change-Id: Id37b96441818c5542b8c340f968183162a47191a