diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2020-08-13 20:33:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-13 20:33:45 +0000 |
| commit | ee63631f2f779c8efd983fd1bfc72cf64647e1fa (patch) | |
| tree | 1c8a51769f66a66ff0b7275590b5628c8f24339d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 300b3cce7222cdd10517a925cb25bc722a019db2 (diff) | |
| parent | a47e1f9a244bfde4e2ad8fbea65e981b6c5acb4f (diff) | |
[automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841 am: 7f45a6fcc0 -s ours am: a47e1f9a24 -s ours
am skip reason: Change-Id I5059d8362a02a7b4622c71fdf15297af87c5a3dd with SHA-1 759c96a3d4 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1394342
Change-Id: Ie4182d1002133522f7f08bfe1da1b33070bbcd0c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions