diff options
| author | 2023-11-23 03:45:09 +0000 | |
|---|---|---|
| committer | 2023-11-23 03:45:09 +0000 | |
| commit | 41c423c504f1c288abc1947e9c736bba0a7207ed (patch) | |
| tree | fa66fb1d9c737f83b59bc62fd414f6804d1924bf /cmds/dumpstate/dumpstate.cpp | |
| parent | 77d406d3694cdcf28febc85ecc62e40554d191f3 (diff) | |
| parent | 539672cd5715b9bab74aac150cc9499672ae8782 (diff) | |
Merge "Update language to comply with Android’s inclusive language guidance" into main am: 04b22dd221 am: 9d3f99b0ce am: 539672cd57
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2836225
Change-Id: Idb3b03c4d77ae09886c47dc3e04aa04e9f09ca1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'cmds/dumpstate/dumpstate.cpp')
| -rw-r--r-- | cmds/dumpstate/dumpstate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp index 17e5cc119d..dd0ee5fb22 100644 --- a/cmds/dumpstate/dumpstate.cpp +++ b/cmds/dumpstate/dumpstate.cpp @@ -1526,7 +1526,7 @@ static void DumpExternalFragmentationInfo() { } static void DumpstateLimitedOnly() { - // Trimmed-down version of dumpstate to only include a whitelisted + // Trimmed-down version of dumpstate to only include a allowlisted // set of logs (system log, event log, and system server / system app // crashes, and networking logs). See b/136273873 and b/138459828 // for context. |