[tor-commits] [orbot/master] Merge branch 'amoghbl1-issue_3014_wizard_workflow'

[n8fr8 at torproject.org]

commit f52c22aa0d695bdf5c545d99cfc89164723ab0bc
Merge: f6750e1 63b4304
Author: Nathan Freitas <nathan at freitas.net>
Date:   Wed Jun 4 23:24:43 2014 -0400

    Merge branch '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(-)