Commit fb3de263 authored Aug 22, 2023 by Treehugger Robot Committed by Automerger Merge Worker Aug 22, 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: 5db4dc6c

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

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

media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -872,7 +872,7 @@ public class MediaRouter2ManagerTest {
		CountDownLatch addedLatch = new CountDownLatch(1);
		CountDownLatch preferenceLatch = new CountDownLatch(1);

		// A dummy callback is required to send route feature info.
		// A placeholder callback is required to send route feature info.
		RouteCallback routeCallback = new RouteCallback() {};
		MediaRouter2Manager.Callback managerCallback = new MediaRouter2Manager.Callback() {
		@Override