| commit | 40dcf0121511d4826d74d145315bf435e303f44c | [log] [tgz] |
|---|---|---|
| author | Patrick Berny <pberny@google.com> | Fri Jan 31 18:29:05 2020 -0800 |
| committer | Patrick Berny <pberny@google.com> | Fri Jan 31 18:35:57 2020 -0800 |
| tree | 62d121d45614b6ab2f7ca09a386acad64d57b3fe | |
| parent | 2801b037cda7614851a9a650d02f5dc833cfe0e7 [diff] | |
| parent | cb56fbeb9d94ea5dfaad7a5a3747e476d88627ae [diff] |
Resolve merge conflicts of cb56fbeb9d94ea5dfaad7a5a3747e476d88627ae to master
Bug: None
Test: cd hardware/interfaces/gnss && mm, check artifacts built
successfully.
Change-Id: I32038aaf40b1d427b838242b7197581b7cde4efd