| commit | 2d077c1ebc373ac7438109d6aaff7e0af38e9f22 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Oct 04 12:39:01 2017 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Wed Oct 04 12:39:01 2017 +0100 |
| tree | abab59406eead0635a5cfdbd43265fcab6d1999f | |
| parent | 82bc62b83150877c9b9d768bc28282d5a18d88ee [diff] | |
| parent | 1c74de82d9f227650d26758681472d7a95b7da36 [diff] |
resolve merge conflicts of 3765bf9bd to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I77e438d4998c241e018a3169848b2ab7c0a403eb