| commit | 6514842d0a1f63b338936f36b628b1d1e60085c3 | [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 | 9dbd509a65e4b96ef75adba9f9eefebb8ab20b20 | |
| parent | b5d588fae6881650453e30208e9974713432f0de [diff] | |
| parent | 2538e1e0132e0e60f7eb5a900b191c03f3020939 [diff] |
resolved conflicts for merge of 5a53816b to mnc-dev Change-Id: Ice1ba8cb9793432e18635e77f4e3309f50bb7b3f