commit 7b4b6f40a8f51e076c9277dc0091b9f0936e73b6
author Lorenzo Colitti <lorenzo@google.com> Fri Nov 27 10:44:42 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 27 10:44:42 2020 +0000
tree ef9dddd08a341fe396ccc344fe9e530166f29ac9
parent 59ecc20061c4465b43773b380b83a80e8834c95b
parent e74700dd5d5084e208d0b723cda3a4409cb011a9

Merge changes I82811a97,Ic508b17e,I23ca7980 am: e74700dd5d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1512851

Change-Id: I480d4d7cea8d6009ef71e0bf30f6d7a18dd99783

.gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ccff052
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+# Eclipse project
+**/.classpath
+**/.project
+
+# IntelliJ project
+**/.idea
+**/*.iml
+**/*.ipr

OWNERS

diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..0e1e65d
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,6 @@
+codewiz@google.com
+jchalard@google.com
+junyulai@google.com
+lorenzo@google.com
+reminv@google.com
+satk@google.com

PREUPLOAD.cfg

diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000..ebc1264
--- /dev/null
+++ b/PREUPLOAD.cfg
@@ -0,0 +1,4 @@
+[Hook Scripts]
+checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
+
+ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py -f ${PREUPLOAD_FILES}