diff options
author | Ficus Kirkpatrick <ficus@android.com> | 2015-03-12 00:07:41 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-12 00:07:41 +0000 |
commit | 2b6b66be82c1560fd6c1f3f34def9ac0d19cda83 (patch) | |
tree | 3ca900b1fcfb0f55ce3785b898f3f4fa3a554373 | |
parent | 9ac6e90f2b36e76e4860cae7e6ab4458b9a49189 (diff) | |
parent | 6c59bc4b15608271298aab6cc3b332d7099dc39f (diff) | |
download | volley-2b6b66be82c1560fd6c1f3f34def9ac0d19cda83.tar.gz |
Merge "gitignore: add local.properties"
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | local.properties | 11 |
2 files changed, 1 insertions, 11 deletions
@@ -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 |