commit c0dd584651948178c28cf8208cedbdbbb50b8aa0 Merge: 3f4b76a 59b3339 Author: Jordan jordannh@sent.com Date: Wed Aug 13 21:39:46 2014 -0700

Merge branch 'app-selection'

res/layout/layout_apps.xml | 89 +++- res/values/strings.xml | 4 + .../torproject/android/settings/AppManager.java | 543 +++++++++++--------- 3 files changed, 376 insertions(+), 260 deletions(-)