Merge cros/upstream to cros/master
Contains the following commits:
" 82f879b5 libqmi-glib,device: ensure control path is included in logs (Aleksander Morgado)"
" c7d9b40e qmi-proxy: compute log time string only if printing the log (Aleksander Morgado)"
" d4c0fd97 build: version bump to flag existence of new API (DTMF) (Dylan Van Assche)"
" cadb6f94 voice: add continuous DTMF support (Dylan Van Assche)"
" 09500ab5 voice: add burst DTMF support (Dylan Van Assche)"
BUG=None
TEST=None
Change-Id: I9a332a6bb889e1177cfc83089cc45c3c601276f3
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..3f3efb9
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,6 @@
+set noparent
+ejcaruso@chromium.org
+pholla@chromium.org
+andrewlassalle@chromium.org
+madhavadas@google.com
+nmarupaka@google.com
diff --git a/README.chromium b/README.chromium
new file mode 100644
index 0000000..f24f201
--- /dev/null
+++ b/README.chromium
@@ -0,0 +1,6 @@
+URL: http://cgit.freedesktop.org/libqmi/
+License: GPLv2
+License File: COPYING
+
+Description:
+ QMI modem protocol helper library.
diff --git a/data/qmi-collection-basic.json b/data/qmi-collection-basic.json
index 283c385..9d1696b 100644
--- a/data/qmi-collection-basic.json
+++ b/data/qmi-collection-basic.json
@@ -178,6 +178,9 @@
"QMI_MESSAGE_OMA_CANCEL_SESSION",
"QMI_MESSAGE_OMA_SEND_SELECTION",
+ "QMI_MESSAGE_SAR_RF_GET_STATE",
+ "QMI_MESSAGE_SAR_RF_SET_STATE",
+
"QMI_MESSAGE_VOICE_INDICATION_REGISTER",
"QMI_MESSAGE_VOICE_ORIGINATE_USSD",
"QMI_MESSAGE_VOICE_ANSWER_USSD",
diff --git a/unblocked_terms.txt b/unblocked_terms.txt
new file mode 100644
index 0000000..2733981
--- /dev/null
+++ b/unblocked_terms.txt
@@ -0,0 +1,9 @@
+# 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.
+dummy
+\bhe\b
+\bshe\b
+master
+\bnative
+sanity
