Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update language to comply with Android's inclusive language guidance" am: f98e615b6d am: 9016cc88e3

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

Change-Id: Ifca888e568832dc25e46bccd72f135017b9638f4
This commit is contained in:
Treehugger Robot
2020-08-14 01:25:12 +00:00
committed by Automerger Merge Worker
parent 9e2226375a 9016cc88e3
commit fbeb17c9ae
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drm/java/android/drm/DrmManagerClient.java
View File

@@ -751,7 +751,7 @@ public class DrmManagerClient implements AutoCloseable {
/** /**
* Removes all the rights information of every DRM plug-in (agent) associated with * 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. * @return ERROR_NONE for success; ERROR_UNKNOWN for failure.
*/ */