feature/android updated (d341adadc8a -> 6dc9a3eeb75)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  d341adadc8a Merge remote-tracking branch 'origin/master' into 
feature/android
      adds  8120f5156cc ; Silence byte compiler in erc-netsplit-JOIN
      adds  c297b828bb7 Fix custom type of erc-autojoin-channels-alist
      adds  6f940c6a118 Plug various leaks and fix input method initialization
      adds  438b1205c54 Mark failing filenotify test as :unstable
       new  6dc9a3eeb75 Merge remote-tracking branch 'origin/master' into 
feature/android


Summary of changes:
 etc/ERC-NEWS                                    |   4 +-
 lisp/erc/erc-join.el                            |   9 +-
 lisp/erc/erc-netsplit.el                        |   4 +-
 src/image.c                                     |  14 ++-
 src/xfns.c                                      |  56 ++++-----
 src/xterm.c                                     | 156 ++++++++++++++++--------
 src/xterm.h                                     |  11 +-
 test/lisp/erc/resources/erc-scenarios-common.el |   2 +-
 test/lisp/filenotify-tests.el                   |   2 +-
 9 files changed, 160 insertions(+), 98 deletions(-)