Merge remote-tracking branch 'aosp/upstream-master' into mymerge
Bug: 225958696
Test: TH
Change-Id: I0aa8d4f1e3c5c95702eee152ced272bc0a8cdf67
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..c546c1b
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,17 @@
+name: "pyyaml"
+description:
+ "A full-featured YAML processing framework for Python"
+
+third_party {
+ url {
+ type: HOMEPAGE
+ value: "https://github.com/yaml/pyyaml.git"
+ }
+ url {
+ type: GIT
+ value: "https://github.com/yaml/pyyaml.git"
+ }
+ version: "6.0"
+ last_upgrade_date { year: 2022 month: 5 day: 20 }
+ license_type: NOTICE
+}
diff --git a/MODULE_LICENSE_MIT b/MODULE_LICENSE_MIT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_MIT
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..2f1b8e1
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,20 @@
+Copyright (c) 2017-2021 Ingy döt Net
+Copyright (c) 2006-2016 Kirill Simonov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..6ebbd75
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,9 @@
+# Android side engprod team
+jdesprez@google.com
+frankfeng@google.com
+murj@google.com
+
+# Mobly team - use for mobly bugs
+angli@google.com
+lancefluger@google.com
+
