tree 6796792f8ecd1eb87d869070dd54074540a9987d
parent 5a4238cd7879f568daa0371950f8c4d3d99825bb
parent e4c0dbb8d8bafb65ed1a803d1fadfffff158cd1d
author Wilson Wu <wilsonwu@google.com> 1598437699 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598437699 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update IMMS to comply with Android's inclusive language guidance" am: d62396372c -s ours am: e4c0dbb8d8

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

Change-Id: I45f19b6b8a1ea764cbdd07b4d3064398c2cbdc37