commit 63b43047ed1b51a03414b82dd8377674a70316d9 Merge: 25f6499 53e82b1 Author: Nathan Freitas nathan@freitas.net Date: Fri May 30 10:40:53 2014 -0400

Merge branch 'issue_3014_wizard_workflow' of https://github.com/amoghbl1/orbot-1 into amoghbl1-issue_3014_wizard_workflow

res/values/strings.xml | 1 + .../android/wizard/ChooseLocaleWizardActivity.java | 19 ++++++++--- .../android/wizard/ConfigureTransProxy.java | 25 ++++++++++---- src/org/torproject/android/wizard/LotsaText.java | 21 +++++++----- src/org/torproject/android/wizard/Permissions.java | 22 ++++++++---- .../torproject/android/wizard/TipsAndTricks.java | 36 ++++++++++++-------- 6 files changed, 84 insertions(+), 40 deletions(-)