| commit | a79e01b62e68818e0a0e0324dd1e2773c0ad4acd | [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 | af8315d4de44fd5f52aee056b0d25a98c040bdd5 [diff] | |
| parent | 3765bf9bd4cb520c59df51070e0fe36afdcfe3de [diff] |
resolve merge conflicts of 3765bf9bd to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I77e438d4998c241e018a3169848b2ab7c0a403eb