summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFicus Kirkpatrick <ficus@android.com>2015-03-12 00:07:41 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-12 00:07:41 +0000
commit2b6b66be82c1560fd6c1f3f34def9ac0d19cda83 (patch)
tree3ca900b1fcfb0f55ce3785b898f3f4fa3a554373
parent9ac6e90f2b36e76e4860cae7e6ab4458b9a49189 (diff)
parent6c59bc4b15608271298aab6cc3b332d7099dc39f (diff)
downloadvolley-2b6b66be82c1560fd6c1f3f34def9ac0d19cda83.tar.gz
Merge "gitignore: add local.properties"
-rw-r--r--.gitignore1
-rw-r--r--local.properties11
2 files changed, 1 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 10b5ff5..8889923 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ build
target
*.iml
.idea
+local.properties
diff --git a/local.properties b/local.properties
deleted file mode 100644
index 4de71c4..0000000
--- a/local.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Wed Jan 28 16:21:52 PST 2015
-sdk.dir=/usr/local/google/clients/android/gcore-orla/prebuilts/fullsdk/linux