tree e0bfef65f32205a1b3307adf71d45fd4c4214c4c
parent 9df4a45b87c376e1bca267dda57af4cd687f53e2
parent 5c018260e0627ec3769ccd0af3bfe2bb8176cf23
author Treehugger Robot <treehugger-gerrit@google.com> 1595857396 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595857396 +0000

Merge "Remove gendered language" am: 35616155b5 am: 5c018260e0

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

Change-Id: I04e61237104aca879ceed99f3d24cff76fe4570b