[glib: 3/3] Merge branch 'android-28' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit c40e8a55b335bfcb6fde921b491afa4a8902a3a0
Merge: cb2982efe cf9613056
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Jun 27 14:34:25 2018 +0000

    Merge branch 'android-28' into 'master'
    
    ci: Add latest Android API level 28
    
    See merge request GNOME/glib!141

 .gitlab-ci.yml                     |  31 ++++++-----
 .gitlab-ci/Dockerfile              |  11 +++-
 .gitlab-ci/android-download-ndk.sh |  31 +++++++++++
 .gitlab-ci/android-setup-env.sh    | 100 ++++++++++++++++++++++++++++++++++
 .gitlab-ci/run-docker.sh           |   2 +-
 .gitlab-ci/setup-android-ndk.sh    | 108 -------------------------------------
 6 files changed, 158 insertions(+), 125 deletions(-)
---