am 0d17c243: am 2b6b66be: Merge "gitignore: add local.properties"
* commit '0d17c243dba2211e9ba094c7ed2199a30bb876b2':
gitignore: add local.properties
diff --git a/.gitignore b/.gitignore
index 10b5ff5..8889923 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
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