feature/android updated (324d66e3901 -> 5ff31bf36cf)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  324d66e3901 Merge remote-tracking branch 'origin/master' into 
feature/android
      adds  2f48e488d4b Delete vc-deduce-fileset-1, taking advantage of 
set-buffer
      adds  9ad601e7d76 Expose the ``cancellation'' of touch events to Lisp
       new  46fd03a4961 Merge remote-tracking branch 'origin/master' into 
feature/android
       new  5ff31bf36cf Update Android port


Summary of changes:
 doc/lispref/commands.texi           | 30 +++++++-----
 etc/NEWS                            |  6 +++
 java/org/gnu/emacs/EmacsNative.java |  9 ++--
 java/org/gnu/emacs/EmacsWindow.java | 19 +++++---
 lisp/touch-screen.el                | 27 +++++++++--
 lisp/vc/vc.el                       | 17 ++-----
 src/android.c                       | 12 +++--
 src/androidgui.h                    | 10 ++++
 src/androidterm.c                   |  5 ++
 src/keyboard.c                      | 91 ++++++++++++++++++++++++++++++------
 src/termhooks.h                     |  6 ++-
 src/xfns.c                          |  1 +
 src/xterm.c                         | 92 ++++++++++++++++++++++++++++++-------
 src/xterm.h                         | 62 +++++++++++++++++++++++--
 14 files changed, 308 insertions(+), 79 deletions(-)