diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-08-11 13:37:19 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-08-11 13:37:19 +0200 |
| commit | eac4bf7d902dc2579983daa29bcb74ca14790de6 (patch) | |
| tree | 1139702220deb293c2f68d712280ff81e5b23f7c /.travis.yml | |
| parent | 92864c6696cf776de356f5e9bbe403a691c8746d (diff) | |
| parent | 4a051b65d1ee004aeea3bcb0a20d0bde1d2200ae (diff) | |
Merged 1.5.2 into trz/master with conflicts resolved
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 4f147a61..a2959e0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,8 @@ android: components: - platform-tools - tools + - build-tools-22.0.1 - build-tools-21.1.2 - build-tools-19.1.0 - - android-21 + - android-22 - extra-android-m2repository |