tree acae25fe35966bc19d802a62c971acf97cd08ef8
parent 262ad024bb6c67e26c93585fb92e01c9eddc93d9
parent f7b2126b75951af8cda3d981cacc3c68f5f5fb2a
author vichang <vichang@google.com> 1595949823 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595949823 +0000

Merge "Update language in android.text.format to comply with Android’s inclusive language guidance" am: f7b2126b75

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

Change-Id: I85773f31e977e6dd78bc6356fe812d0fbfd4473e