| commit | 8df6d037be43bdf98af011d0188e06a21b033aab | [log] [tgz] |
|---|---|---|
| author | Diego Perez <diegoperez@google.com> | Mon Jun 15 16:17:08 2015 +0100 |
| committer | Diego Perez <diegoperez@google.com> | Mon Jun 15 16:17:08 2015 +0100 |
| tree | 00a81f427e8b09c7ea90e377110692dd64b229c5 | |
| parent | 6a7fdbddf7f7cec3ce511994b05eaeb94d18da6a [diff] | |
| parent | 5a53816b0da74f2f7ca302fc7361e7f105ac6bb6 [diff] |
resolved conflicts for merge of 5a53816b to mnc-dev Change-Id: Ice1ba8cb9793432e18635e77f4e3309f50bb7b3f