summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHung Nguyen <hungnv@google.com>2018-01-25 23:04:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-01-25 23:04:53 +0000
commitb98d898b674902a352e1306aa77148bac26e3c15 (patch)
tree5786eaf81caf15e18f9fd95f0e23508ec4ee87c5
parent78375433e2f8a17eb0b4c467ceca5b25134912f8 (diff)
parentc3038467a08961b76ae57867506fd9a73a3e0eb5 (diff)
downloadapkzlib-b98d898b674902a352e1306aa77148bac26e3c15.tar.gz
Merge "Fix ZipToolsTest failing on Windows." into studio-master-dev am: 0a096c4d86
am: c3038467a0 Change-Id: I3f98bfa28daa2e8d303afa6c523ef666709fff61
-rw-r--r--src/test/resources/testData/packaging/text-files/.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/resources/testData/packaging/text-files/.gitattributes b/src/test/resources/testData/packaging/text-files/.gitattributes
new file mode 100644
index 0000000..fa1385d
--- /dev/null
+++ b/src/test/resources/testData/packaging/text-files/.gitattributes
@@ -0,0 +1 @@
+* -text