feature/android updated (83a9e4cee15 -> 7c504d91d18)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  83a9e4cee15 Update Android port
      adds  7b2ad8f199e ; Add missing <<inserted by help-with-tutorial>> line 
to TUTORIAL.fa.
      adds  b5ace2eed80 Document problems with /bin/sh on Solaris 10
      adds  10948948c12 Improve outline-default-state docstring
      adds  af43f0a2954 * doc/misc/erc.texi: Elaborate on upgrading via ELPA.
      adds  1c5140e813d Merge from origin/emacs-29
      adds  c46e93b1f50 Explain ERC 5.5 regressions in new version 5.5.0.29.1
      adds  dde576d731c ; Merge from origin/emacs-29
      adds  0e0fd0c38fd Fix bootstrap on Unix
      adds  521386f9201 ; * admin/charsets/mapconv (LC_ALL): Fix typo.
       new  7c504d91d18 Merge remote-tracking branch 'origin/master' into 
feature/android


Summary of changes:
 admin/charsets/Makefile.in |  2 +-
 admin/charsets/mapconv     |  3 ++-
 doc/misc/erc.texi          | 20 ++++++++++++++++++++
 etc/PROBLEMS               |  9 +++++++++
 etc/tutorials/TUTORIAL.fa  |  7 +------
 lisp/outline.el            |  6 ++++--
 6 files changed, 37 insertions(+), 10 deletions(-)