PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d am: f130a08d5e am: 0dd2798bf6

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

Change-Id: If5c1b0a191bd1695f73c20eb7a6bb535cd8d7217
This commit is contained in:
Treehugger Robot
2020-07-29 06:46:24 +00:00
committed by Automerger Merge Worker
parent c397bd301d 0dd2798bf6
commit 2d6884929e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
View File

@@ -82,7 +82,7 @@ public class SetupChooseLockPasswordTest {
@Test @Test
public void createActivity_shouldNotCrash() { public void createActivity_shouldNotCrash() {
// Basic sanity test for activity created without crashing // Basic test for activity created without crashing
final Intent intent = final Intent intent =
SetupChooseLockPassword.modifyIntentForSetup( SetupChooseLockPassword.modifyIntentForSetup(
application, application,