tree bcbbcdb8bdbefa4fd7e1d3c68b9a070f9fdeab01
parent 297b790bb90349733ebbb26cde947e8602f9edc8
parent 9a07d38c4a7084528726c7d37fa60a0a29bc601e
author Pavan Holla <pholla@chromium.org> 1659988111 +0000
committer Pavan Holla <pholla@chromium.org> 1659988113 +0000

Merge cros/upstream to cros/master

Contains the following commits:

" 9a07d38 build: don't try to match local kernel headers (Aleksander Morgado)"
" 85a0849 libmbim-glib,net-port-manager: new subclass for wwan (Daniele Palmas)"
" dc6901b lbmbim-glib,net-port-manager: split into abstract class and wdm implementation (Daniele Palmas)"
" 601e0dc libmbim-glib,net-port-manager: refactor netlink implementation to new files (Daniele Palmas)"
" 462325f libmbim-glib,device: followup changes to consolidate logging formats (Aleksander Morgado)"
" fc1676b libmbim-glib,device: ensure control path is included in logs (Aleksander Morgado)"
" 25d5b1f mbim-proxy: compute log time string only if printing the log (Aleksander Morgado)"

BUG=None
TEST=None

Change-Id: Ia46c154ea3de17cedf5e17d21dcd9c679a4e9456