| commit | d9b91d0d497031a0c46d06678e2f4f050e52be73 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Wed Nov 26 15:17:02 2014 +0100 |
| committer | Jorim Jaggi <jjaggi@google.com> | Wed Nov 26 15:17:14 2014 +0100 |
| tree | 006b7e8600d45f94713eecea8396dbe84bfbae64 | |
| parent | 58a493accfeafa13fd77a16e832c5ad72a4c9006 [diff] | |
| parent | 803a6dc080f883f95cc02f5c9ad850e73f8e76a8 [diff] |
resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev Change-Id: I194616c947a3366911e932f4c7111097d3767db3