Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.travis.yml
This commit is contained in:
Iiro Krankka
2017-01-09 13:23:37 +02:00

View File

@@ -12,7 +12,7 @@ jdk:
oraclejdk8
before_script:
- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
- echo no | android create avd --force -n test -t android-18 --abi armeabi-v7a
- emulator -avd test -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &