vichang bf325c8d05 Merge "Update language in android.text.format to comply with Android’s inclusive language guidance" am: f7b2126b75 am: 80a5722b9b am: ecf22c3507 am: 21ddfb5a16 am: 0f813ef386 ...

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

Change-Id: I0a54d1b90eb7f0dace467d6fe9743c92e943fa3c

2020-07-28 16:30:07 +00:00

..

java

Merge "Update language in android.text.format to comply with Android’s inclusive language guidance" am: f7b2126b75 am: 80a5722b9b am: ecf22c3507 am: 21ddfb5a16 am: 0f813ef386

2020-07-28 16:30:07 +00:00

jni

Merge "Update JNI to match new MotionEvent initialize"

2020-07-27 23:37:23 +00:00

proto

Merge changes from topic "max_bounds"

2020-07-28 09:11:34 +00:00

res

Import translations. DO NOT MERGE ANYWHERE

2020-07-28 01:44:42 -07:00

tests

Merge "Update graphics language to comply with Android’s inclusive language guidance" am: da4dc882af am: a97e560c61 am: 53ee2070ed am: fada7acad0 am: c6c49d9b92

2020-07-23 14:44:20 +00:00

xsd

…

TEST_MAPPING

…