feature/android updated (d31f557d4c7 -> 5964051fcef)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  d31f557d4c7 Update Android port
      adds  3fb30c8f133 CC Mode: Allow lists of strings as safe values for 
*-font-lock-extra-types
       new  e0417a45771 Merge remote-tracking branch 'origin/master' into 
feature/android
       new  5964051fcef Update Android port


Summary of changes:
 doc/emacs/android.texi              | 15 ++++++++++++-
 java/org/gnu/emacs/EmacsDialog.java | 45 ++++++++++++++++++++++++++++++-------
 lisp/progmodes/cc-vars.el           | 28 +++++++++++++++++++++++
 3 files changed, 79 insertions(+), 9 deletions(-)