| commit | 70f5571a9a950a2b98d07c99a6f8d60b50fe4afd | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Nov 01 11:32:17 2017 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Wed Nov 01 11:32:17 2017 +0000 |
| tree | 27211f9a8c61291c0f9f8d3b0aaf2014a0ed008f | |
| parent | 92eca147c309ab71700fbf1bc1e1628597c4a536 [diff] | |
| parent | 5ab03cb4180762220e344dc96e2198a5b74fcb3f [diff] |
resolve merge conflicts of 5ab03cb41 to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ic749614fb03d60d6cc7e0eb04bb67102e572e9f2