| commit | b9935889b1be2aac4a47d1acbf7547a832edf9f3 | [log] [tgz] |
|---|---|---|
| author | Diego Perez <diegoperez@google.com> | Tue Jul 21 15:28:10 2015 +0100 |
| committer | Diego Perez <diegoperez@google.com> | Tue Jul 21 15:32:55 2015 +0100 |
| tree | 5cac934b7d0920130d5304c7a28381bd3ea27c74 | |
| parent | b2eed1d6e11f38c00ce1776ade14dfa004c6119f [diff] | |
| parent | 112d8a364126ecf8cf53f6e75a6af051cc47a860 [diff] |
resolved conflicts for merge of 112d8a36 to mnc-dev Change-Id: Ic9511a57db8a96f54dba0704800789a8602b9dd2