feature/android updated (a6a586ffc1b -> e18cbd0cc64)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  a6a586ffc1b Merge remote-tracking branch 'origin/master' into 
feature/android
      adds  11c41774302 Add option to keep some columns in 
dired-hide-details-mode
      adds  3b39873ce21 Fix bootstrap failure
       new  e18cbd0cc64 Merge remote-tracking branch 'origin/master' into 
feature/android


Summary of changes:
 lisp/dired.el | 16 ++++++++++++++--
 lisp/man.el   |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)