Nathan Freitas cd6c533a71 Merge branch 'wizard' ... Conflicts: res/values/strings.xml src/org/torproject/android/Orbot.java		2011-07-24 17:09:30 -04:00
..
strings.xml	Merge branch 'wizard'	2011-07-24 17:09:30 -04:00
theme.xml	Wizard UI/UX Refresh	2011-06-13 01:11:46 +05:30