From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 8 Apr 2014 10:31:44 +0000 (+0200)
Subject: Merge branch 'develop' into fixing_travis
X-Git-Tag: oc-android-1.7.0_signed~336^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/14f359da5f642fde67b673c1b834b1ef026a44f7?hp=69d40e505ef57770bddbb24ddc4156e0474993fc

Merge branch 'develop' into fixing_travis
---

diff --git a/.travis.yml b/.travis.yml
index 7ec196c7..4429520a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ before_install:
     - sudo apt-get update -qq
     - sudo apt-get install -qq libstdc++6:i386 lib32z1
     - export COMPONENTS=build-tools-18.1.0,android-14,android-17,android-19,sysimg-19,extra-android-support
-    - curl -L https://raw.github.com/embarkmobile/android-sdk-installer/master/android-sdk-installer | bash /dev/stdin --install=$COMPONENTS
+    - curl -3L https://raw.github.com/embarkmobile/android-sdk-installer/version-1/android-sdk-installer | bash /dev/stdin --install=$COMPONENTS
     - source ~/.android-sdk-installer/env
     - rm pom.xml
     - ./setup_env.sh