feature/android updated (8b102bf6067 -> 9a68041f2cc)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  8b102bf6067 ; * lisp/simple.el (analyze-text-conversion): Remove 
old workaround.
      adds  ef8485ad05d ; * src/window.c (window_wants_header_line): Shut up 
bogus GCC warning.
       new  9a68041f2cc Merge remote-tracking branch 'origin/master' into 
feature/android


Summary of changes:
 src/window.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)