Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into create-profile-screen
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/org/oppia/android/app/activity/ActivityComponentImpl.kt # app/src/main/java/org/oppia/android/app/fragment/FragmentComponentImpl.kt # app/src/main/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentPresenter.kt # app/src/main/res/values-night/color_palette.xml # app/src/main/res/values/color_palette.xml # app/src/main/res/values/component_colors.xml # app/src/main/res/values/strings.xml # app/src/main/res/values/styles.xml # app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentTest.kt # model/src/main/proto/screens.proto # scripts/assets/test_file_exemptions.textproto # utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
- Loading branch information