feature/android updated (fb87f7a9050 -> 458c6e5c917)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  fb87f7a9050 ; * lisp/subr.el (read-char-from-minibuffer): Fix typo.
      adds  3b48fdc912a ruby-ts-mode: Recognize more nodes as sexps
      adds  b3046c6c1f2 Display unlock-file warning only when file locks are 
enabled
      adds  30692f16b15 Improve Tramp robustness
       new  458c6e5c917 Merge remote-tracking branch 'origin/master' into 
feature/android


Summary of changes:
 lisp/files.el                  |  2 +-
 lisp/net/tramp-sh.el           |  2 +-
 lisp/net/tramp.el              | 10 ++++++----
 lisp/progmodes/ruby-ts-mode.el |  1 +
 lisp/userlock.el               | 13 +++++++------
 5 files changed, 16 insertions(+), 12 deletions(-)