Merge "Update language to comply with Android's inclusive language guidance" am: 3261ea7b0a am: eeb9df2066 am: ef7eb94977

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378679

Change-Id: I4648745ab172b40ce468771ce673d64edf802863
This commit is contained in:
Kelly Rossmoyer
2020-07-30 00:49:46 +00:00
committed by Automerger Merge Worker

View File

@@ -66,7 +66,7 @@ import "frameworks/base/core/proto/android/stats/textclassifier/textclassifier_e
import "frameworks/base/core/proto/android/stats/otaupdate/updateengine_enums.proto"; import "frameworks/base/core/proto/android/stats/otaupdate/updateengine_enums.proto";
/** /**
* The master atom class. This message defines all of the available * The primary atom class. This message defines all of the available
* raw stats log events from the Android system, also known as "atoms." * raw stats log events from the Android system, also known as "atoms."
* *
* This field contains a single oneof with all of the available messages. * This field contains a single oneof with all of the available messages.