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

Commit 0edbe3c6 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: aff5d33b am: 197243d1 am: 7a0d6ba5 am: 95476f67 am: 6e337731

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



Change-Id: Iaffa8bbfa70482781d97d0329f7a4150f054cbbe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c69a074e 6e337731

tests/Internal/src/stub/DummyWallpaperService.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package stub; 
import android.service.wallpaper.WallpaperService;



/**

 * Dummy wallpaper service only for test purposes, won't draw anything.

 * Placeholder wallpaper service only for test purposes, won't draw anything.

 */

public class DummyWallpaperService extends WallpaperService {

    @Override