commit 77fa63ed4cc1dc15f8dfed512939d0434cecccc2
author Eric Caruso <ejcaruso@chromium.org> Tue Sep 17 00:20:19 2019
committer Eric Caruso <ejcaruso@chromium.org> Tue Sep 17 00:21:57 2019
tree e3484670f9ecbb31a621a916da64bed8fedec661
parent 6ab7fcefd89faaffc53db0cbe7052dcab9d0c4d8
parent 399dcf407bc3f8385aae77e49a71591ba1a351bd

Merge remote-tracking branch 'cros/upstream' into 'cros/master'

Contains the following changes:
399dcf4 build: post-release version bump to 1.21.0 (Aleksander Morgado)
376824c release: bump version to 1.20.0 (Aleksander Morgado)
e12c962 NEWS: update for 1.20.0 (Aleksander Morgado)
b8f305d mbim-proxy: fix client unsubscribe logic (Aleksander Morgado)
a5379fb mbim-proxy: if client subscribes using wildcard, don't match cid (Aleksander Morgado)
9495539 ms-basic-connect-extensions: untabify (Ben Chan)
47cf7e1 libmbim,cid: fix build with -Werror=type-limits (Aleksander Morgado)
07f4f8f libmbim,uuid: fix build with -Werror=type-limits (Aleksander Morgado)
e7a327f build: define GLIB_VERSION_MAX_ALLOWED and disable deprecation warnings (Aleksander Morgado)

Change-Id: I63a932376c692823a881545e8b7f0ed74395f795