feature/android updated (07716075dbd -> 48329b79148)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  07716075dbd ; * src/keyboard.c (make_lispy_event): Fix botched 
merge.
       new  391c084355a Don't enable scroll-bar-mode by default on Android
       new  48329b79148 Update Android port


Summary of changes:
 lisp/touch-screen.el | 4 ++++
 src/frame.c          | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)