Merge branch '59293-android-template-is-missing-gitlab-ci-yml' into 'master'

Resolve "Android template is missing .gitlab-ci.yml" Closes #59293 See merge request gitlab-org/gitlab-ce!26415

Merge branch '59293-android-template-is-missing-gitlab-ci-yml' into 'master'
134df14c · Nick Thomas · 22fbf734 · f1404d42 · 134df14c · 134df14c
Commit 134df14c authored 5 years ago by Nick Thomas
--- a/changelogs/unreleased/59293-android-template-is-missing-gitlab-ci-yml.yml
+++ b/changelogs/unreleased/59293-android-template-is-missing-gitlab-ci-yml.yml
+---
+title: Add missing .gitlab-ci.yml to Android template
+merge_request: 26415
+author:
+type: fixed
--- a/vendor/project_templates/android.tar.gz
+++ b/vendor/project_templates/android.tar.gz