| commit | aacaf2d4cdf898109d8027e39dbd0befc87251e9 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jul 29 23:45:03 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 29 23:45:03 2020 +0000 |
| tree | 448b33e0309870a8729f403cbf32794548818b97 | |
| parent | e124033623502cb39f0c68594520d5678874eb42 [diff] | |
| parent | 7e423ef84be11b58e5f48dfd99d0cd9774ba1a00 [diff] |
Merge "Update language to comply with Android's inclusive language guidance" am: 6ddb72eef7 am: 1c4b3690ee am: b247f19b89 am: 7d812bfbd7 am: 7e423ef84b Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1375191 Change-Id: I69762d88cc3d8bed374f6a2e9b5a8bd1b98f5692
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