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

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

Change-Id: I8c9c186b11e525777e74b4aecd910dcee6e9a90f
This commit is contained in:
Kelly Rossmoyer
2020-07-30 00:08:34 +00:00
committed by Automerger Merge Worker

View File

@@ -60,7 +60,7 @@ import "frameworks/base/core/proto/android/view/enums.proto";
import "frameworks/base/core/proto/android/wifi/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."
*
* This field contains a single oneof with all of the available messages.