Commit 7a0d6ba5 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 am: 197243d1

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

Change-Id: I1e548de46f57273b5a69d68187517933e71f3de6
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