diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-24 01:16:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-24 01:16:39 +0000 |
| commit | bfd630d112e70f62c15818f15ba176b62bd5d008 (patch) | |
| tree | b60e53c1110314a9d42abb8a626393cbc8147c3d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b57fab0a5ea1ed752bd61a8b8a2415f47436054b (diff) | |
| parent | ee6c5882a13fa8ec693941ce8aefcf98a711db75 (diff) | |
[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 48c50ccdfe am: e34fa22622 am: 824a6b93c8 am: ee6c5882a1 -s ours
am skip reason: Change-Id I6dac60aac172a8fccf4b5671107b41c5c84ccd76 with SHA-1 c22364237a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426648
Change-Id: I889fd5610f23a66602b0a4fcc8f2c1bf47f63fa6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions