master updated (3e232387356 -> 36656ff70e3)

[Po Lu]

oldosfan pushed a change to branch master.

      from  3e232387356 Fixup for "no file modes on windows and dos"
       new  4c9f9dbd501 Revert "Update etc/rgb.txt from X.Org upstream"
       new  36656ff70e3 Properly initialize argment list supplied to 
android_init_emacs


Summary of changes:
 etc/rgb.txt   | 614 ++++++++++++++++++++++++++++------------------------------
 src/android.c |   4 +-
 2 files changed, 295 insertions(+), 323 deletions(-)