From a2035b05baa61af25a0c7a622a8caa56ea1aa46b Mon Sep 17 00:00:00 2001
From: Ricky Barrette <rickbarrette@gmail.com>
Date: Sat, 30 Aug 2014 12:13:45 -0400
Subject: [PATCH] First Install, fail

---
 LocationRinger/LocationRinger.iml                     | 4 ++--
 LocationRinger/project.properties                     | 1 +
 google-play-services_lib/google-play-services_lib.iml | 2 +-
 location_library                                      | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/LocationRinger/LocationRinger.iml b/LocationRinger/LocationRinger.iml
index f51daf2..2f208bc 100644
--- a/LocationRinger/LocationRinger.iml
+++ b/LocationRinger/LocationRinger.iml
@@ -28,8 +28,8 @@
     <orderEntry type="module" module-name="ExceptionHandlerLib" />
     <orderEntry type="module" module-name="LocationLib" />
     <orderEntry type="module" module-name="google-play-services_lib" />
-    <orderEntry type="library" name="google-play-services" level="project" />
-    <orderEntry type="library" name="android-support-v13" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="google-play-services" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="android-support-v13" level="project" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
diff --git a/LocationRinger/project.properties b/LocationRinger/project.properties
index 72b53b0..77b224d 100644
--- a/LocationRinger/project.properties
+++ b/LocationRinger/project.properties
@@ -13,4 +13,5 @@ target=Google Inc.:Google APIs:18
 android.library.reference.1=../exception_handler_library/ExceptionHandlerLib
 android.library.reference.2=../location_library/LocationLib
 android.library.reference.3=../google-play-services_lib
+dex.disable.merger=true
 
diff --git a/google-play-services_lib/google-play-services_lib.iml b/google-play-services_lib/google-play-services_lib.iml
index cefdb8c..6add5b3 100644
--- a/google-play-services_lib/google-play-services_lib.iml
+++ b/google-play-services_lib/google-play-services_lib.iml
@@ -14,7 +14,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="jdk" jdkName="Android 4.3 Google APIs" jdkType="Android SDK" />
-    <orderEntry type="library" name="google-play-services" level="project" />
+    <orderEntry type="library" exported="" name="google-play-services" level="project" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
diff --git a/location_library b/location_library
index 91970d0..ec9fb9a 160000
--- a/location_library
+++ b/location_library
@@ -1 +1 @@
-Subproject commit 91970d0b975b116b2a8b4d524e16a9a4b6311612
+Subproject commit ec9fb9aec03ebd3818561472954346687f17576d