Merge pull request #175 from anthonycr/master

Merge in travis build script updates

.travis.yml

@@ -1,8 +1,8 @@
 language: android
 android:
   components:
-    - build-tools-19.1.0
-    - android-19
+    - build-tools-21.1.1
+    - android-20
     - extra-android-support
   licenses:
     - 'android-sdk-license-.+'

setup-ant.sh

@@ -2,11 +2,6 @@
 
 target="android-20"
 
-# Travis doesn't support android-20 yet
-if [ -n "$TRAVIS" ]; then
-    target="android-19";
-fi
-
 # Update ant setup in project and all sub-projects
 for f in `find external/ -name project.properties`; do
     projectdir=`dirname $f`