feature/android updated (0a113a32c43 -> 85a9757b3c5)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  0a113a32c43 Merge remote-tracking branch 'origin/master' into 
feature/android
      adds  2e85ac2b270 Add new Tramp method "flatpak"
      adds  9914de503bd Improve the logic of the file entry Git hooks to 
support more cases
      adds  e26dcc0e144 ; Fix logic of Git pre-push hook when pushing a new 
branch
      adds  3ce462c8fda When examining merge commits in our Git hooks, only 
check the first parent
      adds  65735cee71c ; Fix last change
       new  85a9757b3c5 Merge remote-tracking branch 'origin/master' into 
feature/android


Summary of changes:
 build-aux/git-hooks/commit-msg-files.awk | 33 +++++++++----
 build-aux/git-hooks/pre-push             | 27 +++++-----
 doc/misc/tramp.texi                      | 10 ++++
 etc/NEWS                                 | 27 +++++-----
 lisp/net/tramp-adb.el                    |  1 +
 lisp/net/tramp-container.el              | 85 ++++++++++++++++++++++++++++++--
 6 files changed, 145 insertions(+), 38 deletions(-)