[glib: 2/2] Merge branch 'fix-cpu-family-in-ci' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 97f9fc62c1ffad0d778ba63d706fe7d85e825096
Merge: d40275ceb ba5a18ace
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Feb 24 11:18:11 2020 +0000

    Merge branch 'fix-cpu-family-in-ci' into 'master'
    
    gitlab-ci: 64-bit ARM is aarch64, not arm64
    
    See merge request GNOME/glib!1376

 .gitlab-ci/android-setup-env.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---