[glib: 5/5] Merge branch 'android-ndk-r17b' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 74cde71ceb8fc7459bc9bdf13836a5178a43cbb7
Merge: e5ff26d65 ca2fc30de
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Jun 22 17:19:46 2018 +0000

    Merge branch 'android-ndk-r17b' into 'master'
    
    Few updates to the CI
    
    See merge request GNOME/glib!133

 .gitlab-ci.yml                  | 10 +++++-----
 .gitlab-ci/Dockerfile           |  4 ++--
 .gitlab-ci/run-docker.sh        | 16 +++++++++++-----
 .gitlab-ci/setup-android-ndk.sh | 14 ++++++++------
 4 files changed, 26 insertions(+), 18 deletions(-)
---