diff options
| author | Jason Hsu <jasonwshsu@google.com> | 2020-08-20 07:59:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-20 07:59:37 +0000 |
| commit | 34f94de5dfc2e393a6060663b3c5969d3e9f2d89 (patch) | |
| tree | c8f4e7455454d67908182b104a44693c853172cf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c02befeca2f64da1b43cadf3543ab0bf330af960 (diff) | |
| parent | 0710b9589d32752ca2104092db2d19405cf65335 (diff) | |
[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: fc81e4d388 -s ours am: 0710b9589d -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: I65ab421b637ed3ea15e601c2014f0e38a9abc93c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions