DO NOT MERGE: Merge commit 'e31a208e36f015ee0fd30e66de304e537f515c28' from merge-oc-support-26.0-dev to stage-aosp-master. am: 915f756d47 -s ours am: 204e9aac8f
am: fe347a5d71
Change-Id: I40913c9f2299acff71e00b45fae7bf692127f207
diff --git a/android-changes.txt b/android-changes.txt
new file mode 100644
index 0000000..8fec0c6
--- /dev/null
+++ b/android-changes.txt
@@ -0,0 +1,4 @@
+This version of jdiff has been modified to generate output using a template
+designed for use exclusively on developer.android.com. It is not suitable for
+use outside the Android platform.
+
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..a277c6d
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+rootProject.name = 'jdiff'
\ No newline at end of file
