Treehugger Robot fbeb17c9ae Merge "Update language to comply with Android's inclusive language guidance" am: f98e615b6d am: 9016cc88e3 ...

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

Change-Id: Ifca888e568832dc25e46bccd72f135017b9638f4

2020-08-14 01:25:12 +00:00

..

java/android/drm

Merge "Update language to comply with Android's inclusive language guidance" am: f98e615b6d am: 9016cc88e3

2020-08-14 01:25:12 +00:00

jni

Update to use nativehelper/JNIPlatformHelp.h

2020-06-24 14:13:49 +01:00