| commit | f6735280cdb627985ec10a10391211aba7a67a57 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Aug 05 08:55:12 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Tue Aug 05 08:55:12 2014 -0700 |
| tree | b539de35965841d45a6990385a6290649ef956bc | |
| parent | d77c40a890bd1b30b0da64f4e240d9ea2dbc7040 [diff] | |
| parent | ac304133ab4b988777bcc5ad12257cbb99c3871e [diff] |
resolved conflicts for merge of ac304133 to lmp-dev-plus-aosp Change-Id: I6886aa3f4066eead9242eb77042d89c4ee28da1b