diff options
| author | 2023-08-22 01:42:03 +0000 | |
|---|---|---|
| committer | 2023-08-22 01:42:03 +0000 | |
| commit | 0b8befa8aae9047bc68b3ec115b7383608311907 (patch) | |
| tree | 926e83f665e5e2727902f298c13d81fbb79c4947 | |
| parent | ea6e62c31b21e674bba180aa1aae17d175ff4708 (diff) | |
| parent | 566fcf4c5a85328ce61884af7a24c852117e6aad (diff) | |
Merge "Update language to comply with Android's inclusive language guidance" into main am: e76260ed76 am: 3f5318c8df am: bc928aba2e am: 566fcf4c5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2720062
Change-Id: Id00b1d39703991eb3e347634989834695d4f2e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/ApkVerityTest/ApkVerityTestApp/feature_split/src/com/android/apkverity/feature_x/DummyActivity.java b/tests/ApkVerityTest/ApkVerityTestApp/feature_split/src/com/android/apkverity/feature_x/DummyActivity.java index 0f694c293330..fe9126003967 100644 --- a/tests/ApkVerityTest/ApkVerityTestApp/feature_split/src/com/android/apkverity/feature_x/DummyActivity.java +++ b/tests/ApkVerityTest/ApkVerityTestApp/feature_split/src/com/android/apkverity/feature_x/DummyActivity.java @@ -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 {} diff --git a/tests/ApkVerityTest/ApkVerityTestApp/src/com/android/apkverity/DummyActivity.java b/tests/ApkVerityTest/ApkVerityTestApp/src/com/android/apkverity/DummyActivity.java index 837c7be37504..a7bd771400c0 100644 --- a/tests/ApkVerityTest/ApkVerityTestApp/src/com/android/apkverity/DummyActivity.java +++ b/tests/ApkVerityTest/ApkVerityTestApp/src/com/android/apkverity/DummyActivity.java @@ -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 {} |