| commit | f41f2547843476a3e79cb2f1f2346f30843504b1 | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Thu Sep 11 18:43:30 2014 +0100 |
| committer | Vladimir Marko <vmarko@google.com> | Thu Sep 11 18:43:30 2014 +0100 |
| tree | d5c8249d3e077520305b8037605123b229dd46eb | |
| parent | 413e662b238f60e0a1ff58e564b6bd8897502f9c [diff] | |
| parent | 4f559aa63f51877bf04aeab00cf2b016571dba1d [diff] |
resolved conflicts for merge of 4f559aa6 to lmp-dev-plus-aosp Change-Id: Ib46ff4493c4f72399b527868afbf18b7a0d38ad1