Commit 922fdf2f authored Aug 14, 2020 by Treehugger Robot Committed by Automerger Merge Worker Aug 14, 2020

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

Merge "Update language to comply with Android's inclusive language guidance" am: f98e615b am: 9016cc88 am: fbeb17c9 am: 25013a7e

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

Change-Id: If371a65c15e320597ba558e9e865fb9e7bcc4945

drm/java/android/drm/DrmManagerClient.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -751,7 +751,7 @@ public class DrmManagerClient implements AutoCloseable {

		/**
		* Removes all the rights information of every DRM plug-in (agent) associated with
		* the DRM framework. Will be used during a master reset.
		* the DRM framework.
		*
		* @return ERROR_NONE for success; ERROR_UNKNOWN for failure.
		*/