| commit | 1c4b3690ee6c44934d3de59260ebb17ed0b27890 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jul 29 22:35:31 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 29 22:35:31 2020 +0000 |
| tree | 5f9bb22bfb64872c53c7d2ba03b0483df170a4ef | |
| parent | a771406f9edb7b38ea16785cf4c490a7395015af [diff] | |
| parent | 6ddb72eef7a17db47a27d7e138a73965afa87388 [diff] |
Merge "Update language to comply with Android's inclusive language guidance" am: 6ddb72eef7 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1375191 Change-Id: Ia7e12e0b0e9b1546535ab78a7e12776ec576f0b6
diff --git a/media/libeffects/proxy/EffectProxy.cpp b/media/libeffects/proxy/EffectProxy.cpp index 42e44f0..c010d68 100644 --- a/media/libeffects/proxy/EffectProxy.cpp +++ b/media/libeffects/proxy/EffectProxy.cpp
@@ -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