tree 427ef9ff3ab084b7bbe5ffc94b138aa00a700929
parent 70d4f9abc923770d30c6b1ff27028f09a7192800
parent 75fa27a1000b77c27433c68e627685bfb91f7cce
author Gyumin Sim <gyumin@google.com> 1599800968 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599800968 +0000

Merge "Comply with inclusive language guidance in media session and browser" am: 93a807bcf7 am: 75fa27a100

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

Change-Id: I2b9b4eef4cf075e9b38de2f5db4e73db3406e16a