aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-02-14 17:00:16 +0100
committerChristian S <christian@pix-art.de>2016-02-14 17:00:16 +0100
commit5e64737d532e493c00ab579ce8bd4695c4a5a5a2 (patch)
treeb82e1131467da94f4f3f58c51bf99dc26add4fc0 /.travis.yml
parent1a6062cc17c421a66d7dbac0389dc7b3a19e3a5f (diff)
parent300326fba3a63fce546d952ac455758ed2cbeca0 (diff)
Merge branch 'siacs/master' into development
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 2930c2509..0b3dd195b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,3 +11,7 @@ android:
- build-tools-19.1.0
- android-23
- extra-android-m2repository
+ - extra-google-m2repository
+ - extra-google-google_play_services
+ licenses:
+ - '.+'