Merge cros/upstream to cros/master
Contains the following commits:
" bf69742 build: version bump to indicate multiplexing support for wwan (Daniele Palmas)"
BUG=None
TEST=None
Change-Id: I738b158a6598a316cd3a2b2375cc821392cf7ca2
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..9712978
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,7 @@
+set noparent
+ejcaruso@chromium.org
+pholla@chromium.org
+andrewlassalle@chromium.org
+madhavadas@google.com
+nmarupaka@google.com
+aleksandermj@google.com
diff --git a/README.chromium b/README.chromium
new file mode 100644
index 0000000..0ad12ac
--- /dev/null
+++ b/README.chromium
@@ -0,0 +1,6 @@
+URL: http://cgit.freedesktop.org/libmbim/libmbim/
+License: GPLv2
+License File: COPYING
+
+Description:
+ MBIM modem protocol helper library.
diff --git a/unblocked_terms.txt b/unblocked_terms.txt
new file mode 100644
index 0000000..60d3f36
--- /dev/null
+++ b/unblocked_terms.txt
@@ -0,0 +1,7 @@
+# Don't delete this file if you want to keep keyword_check enabled even if it's
+# empty.
+# See repohooks/README.md for more details.
+black.?list
+dummy
+\bhe\b
+\bshe\b
