Commit 197243d1 authored Aug 23, 2023 by Treehugger Robot Committed by Automerger Merge Worker Aug 23, 2023

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

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

Change-Id: I0a91365dd5f7e93c761bc749e70ca76a80833f0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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