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

Commit 761a3109 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 am: 566fcf4c am: 0b8befa8

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



Change-Id: Id36a4477adda25bd748a9d3c60700676843f4159
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1218d622 0b8befa8

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 {}