diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-14 01:08:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-14 01:08:09 +0000 |
| commit | 9016cc88e3d2cf9de3d09dc1b4fde6054662a87d (patch) | |
| tree | ac9dc7e820210368ee33d0f281371706f0dc816b /drm/java/android | |
| parent | bf9f6b4f3b641d50855964a58e6a58221180014e (diff) | |
| parent | f98e615b6d2d38ac1072f7bc274ce39140d43380 (diff) | |
Merge "Update language to comply with Android's inclusive language guidance" am: f98e615b6d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399715
Change-Id: Ieb38a2506f125763f4df572ffd6e18a9c663f65e
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 fcebad339f2b..cfce95a23490 100644 --- a/drm/java/android/drm/DrmManagerClient.java +++ b/drm/java/android/drm/DrmManagerClient.java @@ -735,7 +735,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. */ |