| commit | 438e2585b21aff9f418c0f8916ae93dd2ac13498 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Jul 24 17:28:20 2015 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Fri Jul 24 17:28:20 2015 +0100 |
| tree | 4a057e1e155e6b81c265232655748fe8e24594ed | |
| parent | 9c326568fe359e3603cabb870818988b4b2e8b38 [diff] | |
| parent | beb0cff60ec99b721427afe1c94561dcced5daa3 [diff] |
resolved conflicts for merge of beb0cff6 to mnc-dev-plus-aosp Change-Id: Idfc42bc342899f6667cb2992cf3afff71cd36324