diff options
author | Jason Hsu <jasonwshsu@google.com> | 2020-08-19 05:25:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-19 05:25:05 +0000 |
commit | 18702a54c203349e4e8ca378c3e5ed395f6a35fd (patch) | |
tree | 621c85a5ebdd9ea145406e7e84e9d581e1d2112d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f0d495611dcf22c2536e12b3b2e6ca0a71f5e52c (diff) | |
parent | 04ddd768c2656491fac1316e992e589626c772bc (diff) |
[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" into rvc-d1-dev-plus-aosp am: 8dc88a6a46 am: 04ddd768c2 -s ours
am skip reason: Change-Id Ibbd97bf31915d59b5110cbcc8f2126f7a7221060 with SHA-1 cfb9bd346c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12371144
Change-Id: I832f6080c85699bce11e7992d6bc51ddc5dadb83
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions