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

Commit 566fcf4c 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" into main am: e76260ed am: 3f5318c8 am: bc928aba

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2720062



Change-Id: I94cc200afaf61a5f03e98c1877d776feff27e987
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b3026d8b bc928aba

tests/ApkVerityTest/ApkVerityTestApp/feature_split/src/com/android/apkverity/feature_x/DummyActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ package com.android.apkverity.feature_x; 


import android.app.Activity;



/** Dummy class just to generate some dex */

/** Placeholder class just to generate some dex */

public class DummyActivity extends Activity {}

tests/ApkVerityTest/ApkVerityTestApp/src/com/android/apkverity/DummyActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ package com.android.apkverity; 


import android.app.Activity;



/** Dummy class just to generate some dex */

/** Placeholder class just to generate some dex */

public class DummyActivity extends Activity {}