Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f126aafa authored by Kelly Rossmoyer's avatar Kelly Rossmoyer Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: 3261ea7b am: eeb9df20 am: ef7eb949 am: 99ef700f

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

Change-Id: I4b7fd286388f6c441c06b9b7d58536d1ba142d1d
parents de12051d 99ef700f

cmds/statsd/src/atoms.proto

+1 −1
Original line number Original line Diff line number Diff line
@@ -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.