[tor-commits] [orbot/master] Merge branch 'master' of https://github.com/freckles-the-pirate/orbot into freckles-the-pirate-master

[n8fr8 at torproject.org]

commit dbbd8292c211ad3f41cc1ad70ba8dc82ad0893ab
Merge: 3c4642c 37c8319
Author: Nathan Freitas <nathan at freitas.net>
Date:   Tue Sep 30 23:34:08 2014 -0400

    Merge branch 'master' of https://github.com/freckles-the-pirate/orbot into freckles-the-pirate-master

 BUILD                                              |   41 +-
 external/iptables                                  |    1 -
 external/libevent                                  |    1 -
 external/superuser-commands                        |    1 -
 res/drawable-hdpi-v11/ic_menu_agenda.png           |  Bin 0 -> 1010 bytes
 res/drawable-hdpi-v11/ic_menu_clear_playlist.png   |  Bin 0 -> 1163 bytes
 res/drawable-hdpi-v11/inverse.png                  |  Bin 0 -> 1027 bytes
 res/drawable-hdpi-v9/ic_menu_agenda.png            |  Bin 0 -> 1010 bytes
 res/drawable-hdpi-v9/ic_menu_clear_playlist.png    |  Bin 0 -> 1163 bytes
 res/drawable-hdpi-v9/inverse.png                   |  Bin 0 -> 1027 bytes
 res/drawable-hdpi/ic_menu_agenda.png               |  Bin 0 -> 1010 bytes
 res/drawable-hdpi/ic_menu_clear_playlist.png       |  Bin 0 -> 1163 bytes
 res/drawable-hdpi/inverse.png                      |  Bin 0 -> 1027 bytes
 res/drawable-ldpi-v11/ic_menu_agenda.png           |  Bin 0 -> 1010 bytes
 res/drawable-ldpi-v11/ic_menu_clear_playlist.png   |  Bin 0 -> 1163 bytes
 res/drawable-ldpi-v11/inverse.png                  |  Bin 0 -> 1027 bytes
 res/drawable-ldpi-v9/ic_menu_agenda.png            |  Bin 0 -> 1010 bytes
 res/drawable-ldpi-v9/ic_menu_clear_playlist.png    |  Bin 0 -> 1163 bytes
 res/drawable-ldpi-v9/inverse.png                   |  Bin 0 -> 1027 bytes
 res/drawable-ldpi/ic_menu_agenda.png               |  Bin 0 -> 1010 bytes
 res/drawable-ldpi/ic_menu_clear_playlist.png       |  Bin 0 -> 1163 bytes
 res/drawable-ldpi/inverse.png                      |  Bin 0 -> 1027 bytes
 res/drawable-mdpi-v11/ic_menu_agenda.png           |  Bin 0 -> 1010 bytes
 res/drawable-mdpi-v11/ic_menu_clear_playlist.png   |  Bin 0 -> 1163 bytes
 res/drawable-mdpi-v11/inverse.png                  |  Bin 0 -> 1027 bytes
 res/drawable-mdpi-v9/ic_menu_agenda.png            |  Bin 0 -> 1010 bytes
 res/drawable-mdpi-v9/ic_menu_clear_playlist.png    |  Bin 0 -> 1163 bytes
 res/drawable-mdpi-v9/inverse.png                   |  Bin 0 -> 1027 bytes
 res/drawable-mdpi/ic_menu_agenda.png               |  Bin 0 -> 1010 bytes
 res/drawable-mdpi/ic_menu_clear_playlist.png       |  Bin 0 -> 1163 bytes
 res/drawable-mdpi/inverse.png                      |  Bin 0 -> 1027 bytes
 res/drawable-xhdpi-v11/ic_menu_agenda.png          |  Bin 0 -> 1010 bytes
 res/drawable-xhdpi-v11/ic_menu_clear_playlist.png  |  Bin 0 -> 1163 bytes
 res/drawable-xhdpi-v11/inverse.png                 |  Bin 0 -> 1027 bytes
 res/drawable-xhdpi-v9/ic_menu_agenda.png           |  Bin 0 -> 1010 bytes
 res/drawable-xhdpi-v9/ic_menu_clear_playlist.png   |  Bin 0 -> 1163 bytes
 res/drawable-xhdpi-v9/inverse.png                  |  Bin 0 -> 1027 bytes
 res/drawable-xhdpi/ic_menu_agenda.png              |  Bin 0 -> 1010 bytes
 res/drawable-xhdpi/ic_menu_clear_playlist.png      |  Bin 0 -> 1163 bytes
 res/drawable-xhdpi/inverse.png                     |  Bin 0 -> 1027 bytes
 res/drawable-xxhdpi/ic_menu_agenda.png             |  Bin 0 -> 1010 bytes
 res/drawable-xxhdpi/ic_menu_clear_playlist.png     |  Bin 0 -> 1163 bytes
 res/drawable-xxhdpi/inverse.png                    |  Bin 0 -> 1027 bytes
 res/drawable-xxxhdpi/ic_menu_agenda.png            |  Bin 0 -> 1010 bytes
 res/drawable-xxxhdpi/ic_menu_clear_playlist.png    |  Bin 0 -> 1163 bytes
 res/drawable-xxxhdpi/inverse.png                   |  Bin 0 -> 1027 bytes
 res/drawable/ic_inverse.png                        |  Bin 0 -> 1027 bytes
 res/drawable/ic_menu_agenda.png                    |  Bin 0 -> 1010 bytes
 res/drawable/ic_menu_clear_playlist.png            |  Bin 0 -> 1163 bytes
 res/drawable/inverse.png                           |  Bin 0 -> 1027 bytes
 res/layout/layout_apps.xml                         |   89 ++-
 res/values/strings.xml                             |    4 +
 .../torproject/android/settings/AppManager.java    |  604 +++++++++++---------
 53 files changed, 445 insertions(+), 296 deletions(-)