Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c388c98 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb am: f130a08d am: 0dd2798b am: 2d688492 am: 033bbb2d

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: Ief5565c29da133f6c6f09f347f758217d713bbf3
parents d1a60e73 033bbb2d

tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class SetupChooseLockPasswordTest { 


    @Test

    public void createActivity_shouldNotCrash() {

        // Basic sanity test for activity created without crashing

        // Basic test for activity created without crashing

        final Intent intent =

                SetupChooseLockPassword.modifyIntentForSetup(

                        application,