[tor-commits] [orbot/master] Merge branch 'app-selection'

[n8fr8 at torproject.org]

commit a8b737a05c438b1c6571239824624f6312036150
Merge: c0dd584 f3a9cbd
Author: Jordan <jordannh at sent.com>
Date:   Thu Aug 14 14:01:57 2014 -0700

    Merge branch 'app-selection'

 .../torproject/android/settings/AppManager.java    |  111 ++++++++++++--------
 1 file changed, 69 insertions(+), 42 deletions(-)