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

Commit f130a08d 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" am: 2c5a28bb 

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

Change-Id: If0c4119754ddb20c9dab6e6a3221ef2898c34c55
parents 95773b6f 2c5a28bb

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

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,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,