diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-30 01:05:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-30 01:05:43 +0000 |
| commit | 8f38d92489061a90894141d29202c10d0a04e3e3 (patch) | |
| tree | 857df8fd56d46eb850673f0a3905d44344c99445 | |
| parent | 7156e3024b546dd1c733fc2b65d4d92cb9430b91 (diff) | |
| parent | dd27ddb74b42b728c9e3e3aa1606a056978b9320 (diff) | |
| download | LegacyCamera-8f38d92489061a90894141d29202c10d0a04e3e3.tar.gz | |
Merge "AOSP/LegacyCamera - Update language to comply with Android's inclusive language guidance." am: 79a62e3c66 am: 0cb7a1b463 am: d82899c85d am: dd27ddb74b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1378759
Change-Id: Ifd6cf2a7ba92b4ed7448b1e75dc8f776a9678396
| -rwxr-xr-x | jni/feature_mos/doc/feature_mos_API_doxyfile | 2 | ||||
| -rwxr-xr-x | jni/feature_stab/doc/dbreg_API_doxyfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jni/feature_mos/doc/feature_mos_API_doxyfile b/jni/feature_mos/doc/feature_mos_API_doxyfile index dca8c8c0..42d692ba 100755 --- a/jni/feature_mos/doc/feature_mos_API_doxyfile +++ b/jni/feature_mos/doc/feature_mos_API_doxyfile @@ -901,7 +901,7 @@ HHC_LOCATION = # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag # controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). +# it should be included in the primary .chm file (NO). GENERATE_CHI = NO diff --git a/jni/feature_stab/doc/dbreg_API_doxyfile b/jni/feature_stab/doc/dbreg_API_doxyfile index dc61a9c0..17ff77ca 100755 --- a/jni/feature_stab/doc/dbreg_API_doxyfile +++ b/jni/feature_stab/doc/dbreg_API_doxyfile @@ -901,7 +901,7 @@ HHC_LOCATION = # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag # controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). +# it should be included in the primary .chm file (NO). GENERATE_CHI = NO |