Commit 7d812bfb authored Jul 29, 2020 by Treehugger Robot Committed by Automerger Merge Worker Jul 29, 2020

Merge "Update language to comply with Android's inclusive language guidance"...

Merge "Update language to comply with Android's inclusive language guidance" am: 6ddb72ee am: 1c4b3690 am: b247f19b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1375191

Change-Id: Ie20c4b86cec72eea9a918b2b5e1d67b4c3d21b0d

media/libeffects/proxy/EffectProxy.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@
		#include <media/EffectsFactoryApi.h>

		namespace android {
		// This is a dummy proxy descriptor just to return to Factory during the initial
		// This is a stub proxy descriptor just to return to Factory during the initial
		// GetDescriptor call. Later in the factory, it is replaced with the
		// SW sub effect descriptor
		// proxy UUID af8da7e0-2ca1-11e3-b71d-0002a5d5c51b