| commit | 658801ff9ff59ae0f6102a4e15bb3a07742d3d71 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Tue Apr 28 14:28:44 2015 -0700 |
| committer | Paul Lawrence <paullawrence@google.com> | Tue Apr 28 14:28:44 2015 -0700 |
| tree | 857c6d6730f828d27d6945045ee78a7de52cba36 | |
| parent | adc385c265c1c209db2f919840853477fe23c328 [diff] | |
| parent | 6a5244bcc2603ebabe06fa33817c8481c433e0cf [diff] |
resolved conflicts for merge of 6a5244bc to mnc-dev-plus-aosp Change-Id: Ied1bbf09aeeed53daefb53c559498066abd9b767