[glib: 4/4] Merge branch 'wip/jehan/android-master-v3' into 'master'

[Xavier Claessens <xclaesse src gnome org>]

commit 73b229ab3a05bf3491915a953f3a3ae972e29957
Merge: ad957b663 866275f56
Author: Xavier Claessens <xclaesse gmail com>
Date:   Mon Jun 11 13:37:55 2018 +0000

    Merge branch 'wip/jehan/android-master-v3' into 'master'
    
    Wip/jehan/android master v3
    
    See merge request GNOME/glib!93

 gio/glocalfileinfo.c     | 8 ++++++--
 gio/gthreadedresolver.c  | 2 ++
 gio/gunixsocketaddress.c | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)
---