Merge remote-tracking branch 'origin/develop' into installLocationAuto

This commit is contained in:
Kevin Dalley 2017-09-19 11:01:28 -07:00
commit 7aaff18ac3
1 changed files with 2 additions and 2 deletions

View File

@ -11,8 +11,8 @@ dependencies:
- ~/.android - ~/.android
- ~/android - ~/android
pre: pre:
- echo y | android update sdk --no-ui --all --filter "tool,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository,android-23" - echo y | android update sdk --no-ui --all --filter "tool,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository,android-25"
- echo y | android update sdk --no-ui --all --filter "build-tools-23.0.3" - echo y | android update sdk --no-ui --all --filter "build-tools-25.0.3"
override: override:
- echo override dependencies - echo override dependencies