tree edbc3ec3c30a70392fef439dd4c03559440e83fb
parent 3428e2f956f2057cc31f37cf10483b0ad0842f3b
parent bd9e396d1cc1c86e9e33bfb6744b47891997d4e0
author Treehugger Robot <treehugger-gerrit@google.com> 1597722662 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597722662 +0000

Merge "Update InputMethodInfo to comply with Android's inclusive language guidance" am: 2e1b52b1d1 am: 453023d999 am: cb5c7ad1fa am: bd9e396d1c

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

Change-Id: Ie40b2f4241e4ed952f95fe41590e93243999aff6