diff options
| author | Ficus Kirkpatrick <ficus@android.com> | 2015-03-12 01:00:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-12 01:00:05 +0000 |
| commit | 0d17c243dba2211e9ba094c7ed2199a30bb876b2 (patch) | |
| tree | 3ca900b1fcfb0f55ce3785b898f3f4fa3a554373 | |
| parent | 0319699f14da8b1354dedf176c90d01de14e4344 (diff) | |
| parent | 2b6b66be82c1560fd6c1f3f34def9ac0d19cda83 (diff) | |
| download | android_frameworks_volley-0d17c243dba2211e9ba094c7ed2199a30bb876b2.tar.gz android_frameworks_volley-0d17c243dba2211e9ba094c7ed2199a30bb876b2.tar.bz2 android_frameworks_volley-0d17c243dba2211e9ba094c7ed2199a30bb876b2.zip | |
am 2b6b66be: Merge "gitignore: add local.properties"
* commit '2b6b66be82c1560fd6c1f3f34def9ac0d19cda83':
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 |