commit 204e9aac8f80368d182c4ffc8d1a485a9344078f
author Xin Li <delphij@google.com> Thu Aug 03 21:04:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 03 21:04:08 2017 +0000
tree be0e7cd7d6f457268c84e1f036bca2a2b9bd84e0
parent bb6b51fdff904569ecfa9ceffef71d5eedfa1860
parent 915f756d47a2d2e5b1b5249ef1a05ae83d4c0ff1

DO NOT MERGE: Merge commit 'e31a208e36f015ee0fd30e66de304e537f515c28' from merge-oc-support-26.0-dev to stage-aosp-master.
am: 915f756d47  -s ours

Change-Id: I8e0fe100958bc1628d348a986d368517dfa4b2ea

android-changes.txt

diff --git a/android-changes.txt b/android-changes.txt
deleted file mode 100644
index 8fec0c6..0000000
--- a/android-changes.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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.
-