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

[Xavier Claessens <xclaesse src gnome org>]

commit e0a3b0edd561dbec6d6a1e4b97c5b67953e1ba4d
Merge: 137ae066f f83493f83
Author: Xavier Claessens <xclaesse gmail com>
Date:   Mon May 28 14:24:08 2018 +0000

    Merge branch 'android-ci' into 'master'
    
    Add android CI
    
    Closes #1385
    
    See merge request GNOME/glib!15

 .gitlab-ci.yml                  |  14 +++++-
 .gitlab-ci/Dockerfile           |   6 +++
 .gitlab-ci/setup-android-ndk.sh | 106 ++++++++++++++++++++++++++++++++++++++++
 meson.build                     |  20 +++++---
 4 files changed, 138 insertions(+), 8 deletions(-)
---