Commit ad253e77 authored Jul 29, 2020 by Treehugger Robot Committed by Automerger Merge Worker Jul 29, 2020

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

Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f am: da02fb34 am: 0a318adf am: 0093ecd5 am: 78399afc

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

Change-Id: I2e0e40258e13fea3d7337989ffc511304daefdc8

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ public class ChooseLockPatternTest {

		@Test
		public void activityCreationTest() {
		// Basic sanity test for activity created without crashing
		// Basic test for activity created without crashing
		Robolectric.buildActivity(ChooseLockPattern.class, new IntentBuilder(application).build())
		.setup().get();
		}