commit ffe21c4c57c1ed8af955f095ff759e00e8049b64 Merge: 3bcb7625 3b796cf6 Author: n8fr8 <nathan@guardianproject.info> Date: Mon Aug 3 15:11:26 2020 -0400 Merge branch 'bitmold-bridge_wiz_rotation_fix' app/src/main/AndroidManifest.xml | 7 +- .../ui/onboarding/BridgeWizardActivity.java | 118 +++++++++++++++------ .../main/res/layout/activity_custom_bridges.xml | 2 +- app/src/main/res/layout/content_bridge_wizard.xml | 8 ++ app/src/main/res/values/strings.xml | 6 +- 5 files changed, 104 insertions(+), 37 deletions(-)