diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-14 01:25:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-14 01:25:12 +0000 |
| commit | fbeb17c9ae7de86f47ab958782a38e3de432e04c (patch) | |
| tree | 044c61cba1666666bcd57ded78d4906c4bcb9dd3 /drm/java/android | |
| parent | 9e2226375a912416a8286fdd95f96e06d03408da (diff) | |
| parent | 9016cc88e3d2cf9de3d09dc1b4fde6054662a87d (diff) | |
Merge "Update language to comply with Android's inclusive language guidance" am: f98e615b6d am: 9016cc88e3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399715
Change-Id: Ifca888e568832dc25e46bccd72f135017b9638f4
Diffstat (limited to 'drm/java/android')
| -rw-r--r-- | drm/java/android/drm/DrmManagerClient.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/java/android/drm/DrmManagerClient.java b/drm/java/android/drm/DrmManagerClient.java index ba3ebddd4b86..4ec752a6dd9e 100644 --- a/drm/java/android/drm/DrmManagerClient.java +++ b/drm/java/android/drm/DrmManagerClient.java @@ -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. */ |