feature/android updated (f34d9fab892 -> 488a75f2e2b)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  f34d9fab892 Merge remote-tracking branch 'origin/master' into 
feature/android
      adds  8ee205d2325 gud.el: Bring back the pseudo-tool-bar in text frames 
(bug#62041)
       new  4392423cb6d Merge remote-tracking branch 'origin/master' into 
feature/android
       new  488a75f2e2b Port Android battery status to Android 4.4 and earlier


Summary of changes:
 java/org/gnu/emacs/EmacsService.java | 65 ++++++++++++++++++++++++++++++++----
 lisp/battery.el                      | 11 +++++-
 lisp/progmodes/gud.el                | 56 +++++++++++++++++++++++++++----
 src/android.c                        |  4 ++-
 src/android.h                        | 12 +++++++
 src/androidfns.c                     | 16 +++++----
 6 files changed, 144 insertions(+), 20 deletions(-)