diff options
| author | Jason Hsu <jasonwshsu@google.com> | 2020-08-20 07:46:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-20 07:46:56 +0000 |
| commit | 0710b9589d32752ca2104092db2d19405cf65335 (patch) | |
| tree | 9e1dd6ec2719e08ff443ac538ca7f7d480247069 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 21e0928368d0b912814b111f1a42ccd4a157889c (diff) | |
| parent | fc81e4d388e97c8e877a62b7bca955946d7e63d7 (diff) | |
[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: fc81e4d388 -s ours
am skip reason: Change-Id I915e09e4e64d5c268630cec2d0ef05ea0592fd6f with SHA-1 bde40af6ca is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406773
Change-Id: I5ebdc744322c6396d4e55c8806249bfdb821d9d5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions